diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
index 649a677a..68931862 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
@@ -28,6 +28,7 @@ import se.hal.intf.HalAbstractDevice;
 import se.hal.struct.Sensor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -63,6 +64,9 @@ public class DeviceTraitFactory {
     }
 
     public static List<String> getTraitIds(DeviceTrait[] traits) {
+        if (traits == null)
+            return Collections.emptyList();
+
         List<String> list = new ArrayList<>(traits.length);
 
         for (DeviceTrait trait : traits) {