diff --git a/src/i830_driver.c b/src/i830_driver.c
index e950d7c3..e133c856 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1760,8 +1760,9 @@ I830ProcXineramaGetState(ClientPtr client)
     register int		n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-    pWin = LookupWindow(stuff->window, client);
-    if(!pWin) return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1785,8 +1786,9 @@ I830ProcXineramaGetScreenCount(ClientPtr client)
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-    pWin = LookupWindow(stuff->window, client);
-    if(!pWin) return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1810,8 +1812,9 @@ I830ProcXineramaGetScreenSize(ClientPtr client)
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-    pWin = LookupWindow (stuff->window, client);
-    if(!pWin)  return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;