diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index afaf44e7e..3a95a8f8c 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -297,7 +297,7 @@ __glXDRIcontextWait(__GLXcontext * baseContext,
     }
 
     if (ret) {
-        *error = cl->client->noClientException;
+        *error = -1;
         return TRUE;
     }