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 9c32b38b..5d13fb7a 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
@@ -62,7 +62,7 @@ public class DeviceTraitFactory {
                 return new DeviceTrait[]{new SensorStateTrait(), new TemperatureControlTrait()};
 
             default:
-                throw new IllegalArgumentException("Unregistered Sensor device data: " + device.getDeviceData());
+                throw new IllegalArgumentException("Unknown device device class: " + device.getDeviceConfig().getDeviceDataClass());
         }
     }
 
diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
index 839e6de7..f0cc2317 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
@@ -163,7 +163,7 @@ public enum DeviceType {
                 return SENSOR;
 
             default:
-                throw new IllegalArgumentException("Unregistered Sensor device data: " + device.getDeviceData());
+                throw new IllegalArgumentException("Unknown device device class: " + device.getDeviceConfig().getDeviceDataClass());
         }
     }
 }