diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 6785e9db3..54d452e58 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -137,8 +137,10 @@ validGlxContext(ClientPtr client, XID id, int access_mode,
                 __GLXcontext ** context, int *err)
 {
     /* no ghost contexts */
-    if (id & SERVER_BIT)
+    if (id & SERVER_BIT) {
+        *err = __glXError(GLXBadContext);
         return FALSE;
+    }
 
     *err = dixLookupResourceByType((void **) context, id,
                                    __glXContextRes, client, access_mode);