1 files changed, 3 insertions, 1 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index 7ba755c29..8ceda4357 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -402,7 +402,9 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
             /* process slave first, then master */
             dev->public.processInputProc(event, dev);
 
-            if (master)
+            /* Check for the SD's master in case the device got detached
+             * during event processing */
+            if (master && dev->u.master)
                 master->public.processInputProc(
                         (InternalEvent*)masterEvents->event,
                         master);