--- gtk+-2.11.6/gdk/gdkscreen.c.orig	2007-08-19 12:26:37.000000000 +0200
+++ gtk+-2.11.6/gdk/gdkscreen.c	2007-08-19 12:27:08.000000000 +0200
@@ -417,6 +417,8 @@
 const cairo_font_options_t *
 gdk_screen_get_font_options (GdkScreen *screen)
 {
+    if (screen == NULL)
+        return NULL;
     g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
 
     return screen->font_options;