diff --git a/ChangeLog b/ChangeLog
index 725dbc14fd..0962a30059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkkeys-x11.c (get_xkb): Return early in error 
+	cases.  (Coverity)
+
 	* gtk/gtktextview.c (selection_motion_event_handler): Remove
 	some unused variables.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 725dbc14fd..0962a30059 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-04-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkkeys-x11.c (get_xkb): Return early in error 
+	cases.  (Coverity)
+
 	* gtk/gtktextview.c (selection_motion_event_handler): Remove
 	some unused variables.
 
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 417563acaa..f12243acc4 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -180,7 +180,10 @@ get_xkb (GdkKeymapX11 *keymap_x11)
     {
       keymap_x11->xkb_desc = XkbGetMap (xdisplay, XkbKeySymsMask | XkbKeyTypesMask, XkbUseCoreKbd);
       if (keymap_x11->xkb_desc == NULL)
-	g_error ("Failed to get keymap");
+	{
+	  g_error ("Failed to get keymap");
+          return NULL;
+        }
 
       XkbGetNames (xdisplay, XkbGroupNamesMask, keymap_x11->xkb_desc);
     }