diff --git a/Xext/xtest.c b/Xext/xtest.c
index 2798fe258..69ca1db08 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -350,6 +350,10 @@ ProcXTestFakeInput(ClientPtr client)
             return BadAccess;
 
         dev = GetXTestDevice(dev);
+
+        /* This can only happen if we passed a slave to GetXTestDevice() */
+        if (!dev)
+            return BadAccess;
     }