diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
index ff331b04..cde8a85c 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
@@ -115,6 +115,11 @@ public class SmartHomeImpl extends SmartHomeApp implements OAuth2TokenRegistrati
             DeviceType type = DeviceType.getType(device);
             DeviceTrait[] traits = DeviceTraitFactory.getTraits(device);
 
+            if (type == null) {
+                logger.warning("DeviceType returned null for Hal device(" + device.getDeviceConfig() + "): " + device);
+                continue;
+            }
+
             //  Generate payload
 
             SyncResponse.Payload.Device.Builder deviceBuilder =