diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index ef51cc5bf..4131cc691 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-19  Jens Granseuer  <jensgr@gmx.net>
+
+	* gconf-property-editor.c: (peditor_tree_view_widget_changed):
+	don't call gconf_value_free with a NULL value
+
 2007-05-18  Jens Granseuer  <jensgr@gmx.net>
 
 	* gconf-property-editor.c: (peditor_boolean_value_changed),
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index a740c31f7..b52a28d66 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -1927,7 +1927,9 @@ peditor_tree_view_widget_changed (GConfPropertyEditor *peditor,
 	value = peditor->p->conv_from_widget_cb (peditor, value_wid);
 	peditor_set_gconf_value (peditor, peditor->p->key, value);
 	g_signal_emit (peditor, peditor_signals[VALUE_CHANGED], 0, peditor->p->key, value);
-	gconf_value_free (value_wid);
+
+	if (value_wid)
+		gconf_value_free (value_wid);
 	if (value)
 		gconf_value_free (value);
 }