diff --git a/ChangeLog b/ChangeLog
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3ce8773f76..74c64433f2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Oct 12 11:39:20 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Fix to work
+	on empty models.
+
 2001-10-11  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 0e184a0209..b195eeef77 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8036,7 +8036,6 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
   gint y_offset;
 
   g_return_val_if_fail (tree_view != NULL, FALSE);
-  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
   g_return_val_if_fail (tree_view->priv->bin_window != NULL, FALSE);
 
   if (window)
@@ -8047,6 +8046,9 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
   if (column)
     *column = NULL;
 
+  if (tree_view->priv->tree == NULL)
+    return FALSE;
+
   if (x > tree_view->priv->hadjustment->upper)
     return FALSE;