diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 90a72064f..7409bbb59 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-05  Bradford Hovinen  <hovinen@ximian.com>
+
+	* gconf-property-editor.c (peditor_*_value_changed): Only remove
+	from changeset if the changeset is non-NULL
+
 2002-01-04  Bradford Hovinen  <hovinen@ximian.com>
 
 	* gconf-property-editor.c (peditor_set_gconf_value):
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 936534df2..07f2a76c6 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -342,7 +342,9 @@ peditor_boolean_value_changed (GConfClient         *client,
 {
 	GConfValue *value, *value_wid;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+
 	value = gconf_entry_get_value (entry);
 
 	if (value != NULL) {
@@ -408,7 +410,9 @@ peditor_string_value_changed (GConfClient         *client,
 {
 	GConfValue *value, *value_wid;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+
 	value = gconf_entry_get_value (entry);
 
 	if (value != NULL) {
@@ -517,7 +521,8 @@ peditor_color_value_changed (GConfClient         *client,
 	GConfValue *value, *value_wid;
 	GdkColor color;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
 
 	value = gconf_entry_get_value (entry);
 
@@ -596,7 +601,9 @@ peditor_select_menu_value_changed (GConfClient         *client,
 {
 	GConfValue *value, *value_wid;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+
 	value = gconf_entry_get_value (entry);
 
 	if (value != NULL) {
@@ -663,7 +670,9 @@ peditor_select_radio_value_changed (GConfClient         *client,
 	GSList *group;
 	GConfValue *value, *value_wid;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+
 	value = gconf_entry_get_value (entry);
 
 	if (value != NULL) {
@@ -741,7 +750,8 @@ peditor_numeric_range_value_changed (GConfClient         *client,
 {
 	GConfValue *value, *value_wid;
 
-	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
+	if (peditor->p->changeset != NULL)
+		gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
 
 	value = gconf_entry_get_value (entry);