diff --git a/gdk/gdkxid.c b/gdk/gdkxid.c
index 6a538ba520..b32343863c 100644
--- a/gdk/gdkxid.c
+++ b/gdk/gdkxid.c
@@ -53,10 +53,11 @@ gdk_xid_table_remove (XID xid)
 gpointer
 gdk_xid_table_lookup (XID xid)
 {
-  gpointer data;
-
-  data = g_hash_table_lookup (xid_ht, &xid);
+  gpointer data = NULL;
 
+  if (xid_ht)
+    data = g_hash_table_lookup (xid_ht, &xid);
+  
   return data;
 }
 
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 6a538ba520..b32343863c 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -53,10 +53,11 @@ gdk_xid_table_remove (XID xid)
 gpointer
 gdk_xid_table_lookup (XID xid)
 {
-  gpointer data;
-
-  data = g_hash_table_lookup (xid_ht, &xid);
+  gpointer data = NULL;
 
+  if (xid_ht)
+    data = g_hash_table_lookup (xid_ht, &xid);
+  
   return data;
 }