diff --git a/ChangeLog b/ChangeLog
index 1cbc704820..8e9c453d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05  Matthias Clasen <mclasen@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Check that
+	window_private is not NULL before using it.  (#444351, David Ronis)
+
 2007-06-05  Jakub Steiner <jimmac@ximian.com>
 
 	* gtk/stock-icons/{16,24}/gtk-find*: drop the paper sheet.
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index b9560d46ed..5c95de7dfa 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2102,7 +2102,7 @@ gdk_event_translate (GdkDisplay *display,
       else
 #endif
 #if defined(HAVE_XCOMPOSITE) && defined (HAVE_XDAMAGE) && defined (HAVE_XFIXES)
-      if (display_x11->have_xdamage && window_private->composited &&
+      if (display_x11->have_xdamage && window_private && window_private->composited &&
 	  xevent->type == display_x11->xdamage_event_base + XDamageNotify)
 	{
 	  XDamageNotifyEvent *damage_event = (XDamageNotifyEvent *) xevent;