diff --git a/ChangeLog b/ChangeLog
index 4a4172357d..e04569df0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-30  Anders Carlsson  <andersca@gnome.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): Use
+	g_return_if_fail to make sure that the model is a GtkTreeModel.
+
 Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a4172357d..e04569df0a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-06-30  Anders Carlsson  <andersca@gnome.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): Use
+	g_return_if_fail to make sure that the model is a GtkTreeModel.
+
 Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4a4172357d..e04569df0a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-06-30  Anders Carlsson  <andersca@gnome.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): Use
+	g_return_if_fail to make sure that the model is a GtkTreeModel.
+
 Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4a4172357d..e04569df0a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-06-30  Anders Carlsson  <andersca@gnome.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): Use
+	g_return_if_fail to make sure that the model is a GtkTreeModel.
+
 Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 0c345981a3..f1f567df7f 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8747,6 +8747,7 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
 			 GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (GTK_IS_TREE_MODEL (model));
 
   if (model == tree_view->priv->model)
     return;