diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 3ea5d3e3a..d851dfe3a 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-01  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-mouse-properties.c: (cursor_theme_changed):
+	don't crash if there is no cursor theme installed (Closes: #311599).
+
 2005-07-31  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-mouse-properties.c: (delay_value_changed_cb),
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 6e5a3def7..6a23e9f3e 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -472,9 +472,9 @@ cursor_theme_changed (GConfClient *client,
 	GtkTreeModel    * smodel    = gtk_tree_view_get_model(view);
 	GtkTreeModel    * model     = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(smodel));
 	gchar           * theme     = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
-	gtk_tree_model_get_iter_root(model, &iter);
 	gint              size      = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
-	gtk_tree_model_get_iter_root(model, &iter);
+
+	g_return_if_fail (gtk_tree_model_get_iter_first (model, &iter));
 
 	do {
 		gchar* theme_name;