diff --git a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
index 992d5106..16da84b9 100644
--- a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
+++ b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
@@ -151,6 +151,10 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             for (int id : InputDevice.getDeviceIds()) {
                 InputDevice inputDev = InputDevice.getDevice(id);
+                if (inputDev == null) {
+                    // Device was removed while looping
+                    continue;
+                }
 
                 if (inputDev.getVendorId() == device.getVendorId() &&
                         inputDev.getProductId() == device.getProductId()) {