diff --git a/dix/devices.c b/dix/devices.c
index bbb4fa2a9..c6fd3aa09 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -457,13 +457,9 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     }
 
     if (IsMaster(dev) && dev->spriteInfo->sprite) {
-        for (other = inputInfo.devices; other; other = other->next) {
-            if (other->spriteInfo->paired == dev) {
-                ErrorF("[dix] cannot disable device, still paired. "
-                       "This is a bug. \n");
-                return FALSE;
-            }
-        }
+        for (other = inputInfo.devices; other; other = other->next)
+            BUG_RETURN_VAL_MSG(other->spriteInfo->paired == dev, FALSE,
+                               "%s still paired with %s", dev->name, other->spriteInfo->paired->name);
     }
 
     (void) (*dev->deviceProc) (dev, DEVICE_OFF);