diff --git a/ChangeLog b/ChangeLog
index 686c6c354..b8431147c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-08  Havoc Pennington  <hp@pobox.com>
+
+	* src/prefs.c (update_workspace_name): also treat empty string as 
+	"unset" in this function.
+
 Thu Dec  5 18:41:02 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
 	* src/window.h (META_WINDOW_IN_NORMAL_TAB_CHAIN,
diff --git a/src/prefs.c b/src/prefs.c
index 502506e03..9eb4c2ae0 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1566,7 +1566,13 @@ update_workspace_name (const char  *name,
       return FALSE;
     }  
 
-  if (value != NULL)
+  /* This is a bad hack. We have to treat empty string as
+   * "unset" because the root window property can't contain
+   * null. So it gets empty string instead and we don't want
+   * that to result in setting the empty string as a value that
+   * overrides "unset".
+   */
+  if (value != NULL && *value != '\0')
     {
       g_free (workspace_names[i]);
       workspace_names[i] = g_strdup (value);
diff --git a/src/stack.c b/src/stack.c
index 050360c0b..e91c62012 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -537,6 +537,8 @@ create_constraints (Constraint **constraints,
 
       if (!WINDOW_IN_STACK (w))
         {
+          meta_topic (META_DEBUG_STACK, "Window %s not in the stack, not constraining it\n",
+                      w->desc);
           tmp = tmp->next;
           continue;
         }