diff --git a/xkb/xkb.c b/xkb/xkb.c
index b6ca3c40b5..ee58be230c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5915,7 +5915,7 @@ ProcXkbGetKbdByName(ClientPtr client)
         x_rpcbuf_write_rpcbuf_pad(&rpcbuf, &childbuf);
     }
 
-    X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
+    status = X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
 
     if (loaded) {
         XkbDescPtr old_xkb;
@@ -5973,7 +5973,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     XkbSetCauseXkbReq(&cause, X_kbGetKbdByName, client);
     XkbUpdateAllDeviceIndicators(NULL, &cause);
 
-    return Success;
+    return status;
 }
 
 /***====================================================================***/