diff --git a/ChangeLog b/ChangeLog
index e7d1d08334..00fca272a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-04  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_add_attribute):
+	g_return_if_fail() is the cell is not part of the combo instead of
+	crashing in the next line.
+
 2008-02-01  Cody Russell  <cody@jhu.edu>
 
 	* modules/engines/ms-windows/xp_theme.[ch]
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 7021e71601..c1f9156041 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4264,6 +4264,7 @@ gtk_combo_box_cell_layout_add_attribute (GtkCellLayout   *layout,
   combo_box = GTK_COMBO_BOX (layout);
 
   info = gtk_combo_box_get_cell_info (combo_box, cell);
+  g_return_if_fail (info != NULL);
 
   info->attributes = g_slist_prepend (info->attributes,
                                       GINT_TO_POINTER (column));