diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 8e7808ebb..d98d86a86 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-21  Seth Nickell  <snickell@stanford.edu>
+
+	* gnome-window-properties.c: (update_gui):
+
+	Fix segfault caused by a WM where the settings module
+	wasn't found.
+	
 2002-10-21  Seth Nickell  <snickell@stanford.edu>
 
         Patch from sylvain_pasche@yahoo.fr
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index e05f67197..af4844c9a 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -151,7 +151,7 @@ update_gui (void)
 
         for (tmp_list = gnome_wm_manager_get_list (); tmp_list != NULL; tmp_list = tmp_list->next) {
                 wm = tmp_list->data;
-                wm_widget_add_wm (wm);
+                if (wm != NULL) wm_widget_add_wm (wm);
         }
         
         in_fill = FALSE;