diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index dc0f7c4f0..e0d63ee13 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-03  Richard Hestilow  <hestilow@ximian.com>
+
+	* capplet-dir.c (capplet_new): Check for ditem::icon != NULL
+	before calling gnome_pixmap_file.
+
+	* gnomecc.glade: Remove toolbar & menu stuff (this was causing
+	runtime glade warnings).
+
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
 	* capplet-dir-view-list.c: Eliminate compiler warnings
diff --git a/control-center/capplet-dir-view-list.c b/control-center/capplet-dir-view-list.c
index 978c58c61..d33ad9a14 100644
--- a/control-center/capplet-dir-view-list.c
+++ b/control-center/capplet-dir-view-list.c
@@ -163,7 +163,7 @@ sidebar_dummy_foreach (GtkTreeModel *model, GtkTreePath *path,
 	
 	g_return_if_fail (dir != NULL);
 
-	g_value_init (&val, G_TYPE_POINTER);
+	//g_value_init (&val, G_TYPE_POINTER);
 	gtk_tree_model_get_value (model, iter, SIDEBAR_DATA, &val);
 	*dir = g_value_get_pointer (&val);
 }
diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c
index 3d97fe083..3b54b7fff 100644
--- a/control-center/capplet-dir.c
+++ b/control-center/capplet-dir.c
@@ -107,10 +107,12 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
 	}
 	if (!g_file_exists (entry->icon))
 	{
+		const gchar *icon;
 		g_free (entry->icon);
-		entry->icon = gnome_pixmap_file (
-				gnome_desktop_item_get_string (dentry,
-					GNOME_DESKTOP_ITEM_ICON));
+		icon = gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON);
+		if (icon)
+			entry->icon = gnome_pixmap_file (icon);
+
 		if (!entry->icon)
 			entry->icon = gnome_pixmap_file ("gnome-unknown.png");
 	}
diff --git a/control-center/gnomecc.glade b/control-center/gnomecc.glade
index e4048916c..75b746841 100644
--- a/control-center/gnomecc.glade
+++ b/control-center/gnomecc.glade
@@ -267,7 +267,7 @@
     <property name="enable_layout_config">yes</property>
     <property name="window-position">GTK_WIN_POS_NONE</property>
 
-    <child internal-child="vbox">
+<!--    <child internal-child="vbox">
       <widget class="GnomeDock" id="dock1">
         <property name="allow_floating">yes</property>
         <property name="visible">yes</property>
@@ -351,11 +351,10 @@
         <property name="expand">yes</property>
         <property name="fill">yes</property>
       </packing>
-    </child>
+    </child> -->
 
     <child>
       <widget class="GnomeAppBar" id="appbar1">
-        <property name="child_name">GnomeApp:appbar</property>
         <property name="has_progress">no</property>
         <property name="has_status">yes</property>
         <property name="visible">yes</property>
@@ -365,6 +364,6 @@
         <property name="expand">yes</property>
         <property name="fill">yes</property>
       </packing>
-    </child>
+    </child> 
   </widget>
 </glade-interface>