Index: metacity//src/workspace.c
===================================================================
RCS file: /export/cvs/gnome-2.0/metacity/src/workspace.c,v
retrieving revision 1.46
diff -p -u -5 -r1.46 workspace.c
--- metacity//src/workspace.c	2003/08/15 22:09:55	1.46
+++ metacity//src/workspace.c	2003/09/18 04:22:31
@@ -714,19 +714,22 @@ meta_workspace_focus_mru_window (MetaWor
     meta_topic (META_DEBUG_FOCUS,
                 "Focusing MRU window excluding %s\n", not_this_one->desc);
   
   tmp = workspace->mru_list;  
 
-  while (tmp)
+  if (not_this_one)
     {
-      if (((MetaWindow*) tmp->data) != not_this_one)
+      while (tmp)
         {
-          window = tmp->data;
-	  break;
-        }
+          if (((MetaWindow*) tmp->data) != not_this_one)
+            {
+               window = tmp->data;
+	       break;
+            }
 
-      tmp = tmp->next;
+          tmp = tmp->next;
+        }
     }
 
   if (window)
     {
       meta_topic (META_DEBUG_FOCUS,
