diff --git a/ChangeLog b/ChangeLog
index f342db66c3..0cfa142ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
+	on duplicate destroy.  (#318953, Gustavo Carneiro)
+
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog): 
 	Point out that destroy-with-parent is a bad idea for the dialog
 	passed to this function.  (#318943, Christian Persch)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f342db66c3..0cfa142ebd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
+	on duplicate destroy.  (#318953, Gustavo Carneiro)
+
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog): 
 	Point out that destroy-with-parent is a bad idea for the dialog
 	passed to this function.  (#318943, Christian Persch)
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fd77f953ce..d385e1aa62 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1408,13 +1408,13 @@ gtk_tree_view_destroy (GtkObject *object)
 	}
     }
 
-  if (tree_view->priv->search_destroy)
+  if (tree_view->priv->search_destroy && tree_view->priv->search_user_data)
     {
       (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
       tree_view->priv->search_user_data = NULL;
     }
 
-  if (tree_view->priv->row_separator_destroy)
+  if (tree_view->priv->row_separator_destroy && tree_view->priv->row_separator_data)
     {
       (* tree_view->priv->row_separator_destroy) (tree_view->priv->row_separator_data);
       tree_view->priv->row_separator_data = NULL;