diff --git a/ChangeLog b/ChangeLog
index 4a0eed1277..d0e116857f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_show): Add a g_return_if_fail.
+	(#362614, Xan Lopez)
+
 2006-12-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkuimanager.c (update_node): If a required action
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 890040b024..3ec0d0df95 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2214,6 +2214,8 @@ gtk_widget_destroyed (GtkWidget      *widget,
 void
 gtk_widget_show (GtkWidget *widget)
 {
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   if (!GTK_WIDGET_VISIBLE (widget))
     {
       g_object_ref (widget);