diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 773cd5776..5fb0ebc4d 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-11  Richard Hestilow  <hestilow@ximian.com>
+
+	* gnome-mouse-properties.c (drawing_area_button_press_event):
+	Check for changeset != NULL before looking in changeset.
+
 2002-03-10  Seth Nickell  <snickell@stanford.edu>
 
 	* gnome-mouse-properties.c: (main):
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 38e26c26c..1328cc272 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -188,7 +188,7 @@ drawing_area_button_press_event (GtkWidget      *widget,
 	if (event->type != GDK_BUTTON_PRESS)
 		return FALSE;
 
-	if (!gconf_change_set_check_value (changeset, DOUBLE_CLICK_KEY, &value)) 
+	if (!(changeset && gconf_change_set_check_value (changeset, DOUBLE_CLICK_KEY, &value))) 
 		double_click_time = gconf_client_get_int (gconf_client_get_default (), DOUBLE_CLICK_KEY, NULL);
 	else
 		double_click_time = gconf_value_get_int (value);