1 files changed, 11 insertions, 1 deletions
diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index b9c2c9a87c..5b2a381c69 100644
--- a/gtk/gtkgridview.c
+++ b/gtk/gtkgridview.c
@@ -270,7 +270,17 @@ gtk_grid_view_get_cell_at_y (GtkGridView *self,
       if (pos % self->n_columns)
         {
           skip = self->n_columns - pos % self->n_columns;
-          g_assert (n_items > skip);
+          if (n_items <= skip)
+            {
+              g_warning ("ran out of items");
+              if (position)
+                *position = 0;
+              if (offset)
+                *offset = 0;
+              if (size)
+                *size = 0;
+              return NULL;
+            }
           n_items -= skip;
           pos += skip;
         }