diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index 3b29b09..7c2fc8e 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -245,6 +245,7 @@
     int32_t id = deviceId & ID_MASK;
     if (id >= mNumDevicesById || id < 0) return NULL;
     device_t* dev = mDevicesById[id].device;
+    if (dev == NULL) return NULL;
     if (dev->id == deviceId) {
         return dev;
     }