diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 2135a6a65..d365a5b92 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-08  Jody Goldberg <jody@gnome.org>
+
+	* gnome-theme-details.c (gnome_theme_details_update_from_gconf) :
+	  handle lack of metacity.
+	(window_theme_selection_changed) : ditto.
+	(gnome_theme_details_reread_themes_from_disk) : ditto.
+
 Wed Jan  8 01:57:09 2003  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-theme-manager.c (add_initial_row_to_meta_theme): handle
diff --git a/capplets/theme-switcher/gnome-theme-details.c b/capplets/theme-switcher/gnome-theme-details.c
index aa8e30154..5c1c3f0b3 100644
--- a/capplets/theme-switcher/gnome-theme-details.c
+++ b/capplets/theme-switcher/gnome-theme-details.c
@@ -124,10 +124,11 @@ window_theme_selection_changed (GtkTreeSelection *selection,
     }
 
   window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
-
-  wm_settings.flags = GNOME_WM_SETTING_THEME;
-  wm_settings.theme = window_theme_name;
-  gnome_window_manager_change_settings (window_manager, &wm_settings);
+  if (window_manager != NULL) {
+    wm_settings.flags = GNOME_WM_SETTING_THEME;
+    wm_settings.theme = window_theme_name;
+    gnome_window_manager_change_settings (window_manager, &wm_settings);
+  }
 
 }
 
@@ -376,7 +377,7 @@ gnome_theme_details_reread_themes_from_disk (void)
   g_list_free (theme_list);
 
   /* Next, we do the window managers */
-  theme_list = gnome_window_manager_get_theme_list (window_manager);
+  theme_list = window_manager ? gnome_window_manager_get_theme_list (window_manager) : NULL;
   string_list = NULL;
   for (list = theme_list; list; list = list->next)
     {
@@ -519,9 +520,10 @@ gnome_theme_details_update_from_gconf (void)
 
   tree_view = WID ("window_theme_treeview");
   wm_settings.flags = GNOME_WM_SETTING_THEME;
-  if (window_manager)
+  if (window_manager) {
     gnome_window_manager_get_settings (window_manager, &wm_settings);
-  update_list_something (tree_view, wm_settings.theme);
+    update_list_something (tree_view, wm_settings.theme);
+  }
 
   tree_view = WID ("icon_theme_treeview");
   theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL);