diff --git a/ChangeLog b/ChangeLog
index 7545737d0..1a5bb0e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-09  Christian Dywan  <christian@imendio.com>
+
+	Fail in gdk_window_new if _gdk_window_new failed
+
+	* gdk/gdkwindow.c (gdk_window_new): Add g_return_val_if_fail
+        in case _gdk_window_new is NULL. Approved by Tim Janik
+
 2009-01-08  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 566733 – Add GIcon to GtkAction, GtkToolButton
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index a0f31f45c..40dc2b12e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -373,6 +373,7 @@ gdk_window_new (GdkWindow     *parent,
   g_return_val_if_fail (attributes != NULL, NULL);
 
   window = _gdk_window_new (parent, attributes, attributes_mask);
+  g_return_val_if_fail (window != NULL, window);
 
   /* Inherit redirection from parent */
   if (parent != NULL)