diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 1e20633e2..bf642f3fb 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* gnome-theme-manager.c: (idle_async_func), (load_meta_themes):
+	use the default image if the thumbnailer fails.
+
 2003-06-24  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.3.3
diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c
index e719c4720..6bb523161 100644
--- a/capplets/theme-switcher/gnome-theme-manager.c
+++ b/capplets/theme-switcher/gnome-theme-manager.c
@@ -129,7 +129,7 @@ idle_async_func (GdkPixbuf *pixbuf,
       if (test_theme_id && !strcmp (theme_id, test_theme_id))
 	{
 	  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			      META_THEME_PIXBUF_COLUMN, pixbuf,
+			      META_THEME_PIXBUF_COLUMN, pixbuf ? pixbuf : default_image,
 			      -1);
 	  g_free (test_theme_id);
 	  break;
@@ -442,13 +442,12 @@ load_meta_themes (GtkTreeView *tree_view,
 
 	  blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
 				   list_meta_theme_info->readable_name, list_meta_theme_info->comment);
+	  pixbuf = NULL;
 	  if (i <= MAX_ELEMENTS_BEFORE_SCROLLING)
 	    pixbuf = generate_theme_thumbnail (list_meta_theme_info, FALSE);
-	  else
-	    pixbuf = default_image;
 
 	  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			      META_THEME_PIXBUF_COLUMN, pixbuf,
+			      META_THEME_PIXBUF_COLUMN, pixbuf ? pixbuf : default_image,
 			      META_THEME_NAME_COLUMN, blurb,
 			      META_THEME_ID_COLUMN, list_meta_theme_info->name,
 			      META_THEME_FLAG_COLUMN, list_is_default ? THEME_FLAG_DEFAULT : 0,