--- xorg-server-1.16.0/dix/devices.c.orig	2014-06-05 06:22:57.000000000 +0100
+++ xorg-server-1.16.0/dix/devices.c	2014-08-03 10:37:07.192008015 +0100
@@ -416,7 +416,7 @@
         XISendDeviceHierarchyEvent(flags);
     }
 
-    if (!IsMaster(dev))
+    if (!IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) != NULL)
         XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0);
     RecalculateMasterButtons(dev);