diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog
index 63ed0bdad..a0c4a3117 100644
--- a/libbackground/ChangeLog
+++ b/libbackground/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-10  Bradford Hovinen  <hovinen@ximian.com>
+
+	Courtesy of Jean Schurger <jschurger@schurger.org>:
+	* preferences.c (bg_preferences_merge_entry): Make sure the
+	wallpaper filename is non-NULL before doing anything with it
+
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
 	* applier.c (bg_applier_apply_prefs): Disable the wallpaper if we
diff --git a/libbackground/preferences.c b/libbackground/preferences.c
index 0bc396168..a945e046d 100644
--- a/libbackground/preferences.c
+++ b/libbackground/preferences.c
@@ -240,6 +240,7 @@ bg_preferences_merge_entry (BGPreferences    *prefs,
 	}
 	else if (!strcmp (entry->key, "/desktop/gnome/background/wallpaper-enabled")) {
 		if (gconf_value_get_bool (value) &&
+				(prefs->wallpaper_filename != NULL) &&
 		    strcmp (prefs->wallpaper_filename, "") != 0 &&
 		    strcmp (prefs->wallpaper_filename, "(none)") != 0)
 			prefs->wallpaper_enabled = TRUE;