diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 24bda7452a..631ed58bba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -935,6 +935,9 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
         }
         for(DeviceStruct struct : deviceStructs){
             if(struct.getDevice().equals(device)){
+                if(struct.getDeviceSupport() == null)
+                    throw new DeviceNotFoundException(device);
+
                 return struct.getDeviceSupport();
             }
         }