diff --git a/Xi/exevents.c b/Xi/exevents.c
index ac05819a5..32a6e39cb 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -491,6 +491,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
             if (!k->xkb_sli)
                 continue;
             if (k->xkb_sli->flags & XkbSLI_IsDefault) {
+                assert(to->key);
                 k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators;
                 k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps;
             }
@@ -1044,6 +1045,7 @@ TouchClientWantsOwnershipEvents(ClientPtr client, DeviceIntPtr dev,
 {
     InputClients *iclient;
 
+    assert(wOtherInputMasks(win));
     nt_list_for_each_entry(iclient, wOtherInputMasks(win)->inputClients, next) {
         if (rClient(iclient) != client)
             continue;
@@ -1389,6 +1391,8 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti,
             else
                 evtype = GetXI2Type(ev->any.type);
 
+            assert(iclients);
+            assert(wOtherInputMasks(*win));
             nt_list_for_each_entry(iclients,
                                    wOtherInputMasks(*win)->inputClients, next)
                 if (xi2mask_isset(iclients->xi2mask, dev, evtype))
@@ -1403,6 +1407,7 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti,
             int xi_type = GetXIType(TouchGetPointerEventType(ev));
             Mask xi_filter = event_get_filter_from_type(dev, xi_type);
 
+            assert(wOtherInputMasks(*win));
             nt_list_for_each_entry(iclients,
                                    wOtherInputMasks(*win)->inputClients, next)
                 if (iclients->mask[dev->id] & xi_filter)
@@ -2292,6 +2297,7 @@ RetrieveGestureDeliveryData(DeviceIntPtr dev, InternalEvent *ev, GestureListener
            listener->type == GESTURE_LISTENER_REGULAR */
         evtype = GetXI2Type(ev->any.type);
 
+        assert(wOtherInputMasks(*win));
         nt_list_for_each_entry(iclients, wOtherInputMasks(*win)->inputClients, next)
             if (xi2mask_isset(iclients->xi2mask, dev, evtype))
                 break;
@@ -2681,6 +2687,7 @@ SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
                     return BadAccess;
             }
         }
+        assert(wOtherInputMasks(pWin));
         for (others = wOtherInputMasks(pWin)->inputClients; others;
              others = others->next) {
             if (SameClient(others, client)) {
@@ -3340,6 +3347,7 @@ XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
     if (len && !others) {
         if (AddExtensionClient(win, client, 0, 0) != Success)
             return BadAlloc;
+        assert(wOtherInputMasks(win));
         others = wOtherInputMasks(win)->inputClients;
     }
 
@@ -3349,6 +3357,7 @@ XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
     }
 
     if (len) {
+        assert(others);
         xi2mask_set_one_mask(others->xi2mask, dev->id, mask, len);
     }