diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index ce6d229..7a8111e 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -259,9 +259,15 @@ ProcXIChangeHierarchy(ClientPtr client)


                     ptr = GetMaster(ptr, MASTER_POINTER);
+                    rc = dixLookupDevice(&ptr,
+                                         ptr->id,
+                                         client,
+                                         DixDestroyAccess);
+                    if (rc != Success)
+                        goto unwind;
                     keybd = GetMaster(ptr, MASTER_KEYBOARD);
                     rc = dixLookupDevice(&keybd,
-                                         ptr->spriteInfo->paired->id,
+                                         keybd->id,
                                          client,
                                          DixDestroyAccess);
                     if (rc != Success)