diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index b9e295815..c5b0ba7b6 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -110,8 +110,8 @@ ProcXIQueryPointer(ClientPtr client)
 
     rc = dixLookupWindow(&pWin, stuff->win, client, DixGetAttrAccess);
     if (rc != Success) {
-        SendErrorToClient(client, IReqCode, X_XIQueryPointer, stuff->win, rc);
-        return Success;
+        client->errorValue = stuff->win;
+        return rc;
     }
 
     if (pDev->valuator->motionHintWindow)