--- gdk/gdkscreen.c.orig	2007-09-13 23:36:09.000000000 +0300
+++ gdk/gdkscreen.c	2007-09-25 18:16:53.000000000 +0300
@@ -417,6 +417,7 @@
 const cairo_font_options_t *
 gdk_screen_get_font_options (GdkScreen *screen)
 {
+    g_return_val_if_fail (screen != NULL, NULL);
     g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
 
     return screen->font_options;