diff --git a/homeassistant/components/deconz/device_trigger.py b/homeassistant/components/deconz/device_trigger.py index 869a6ef3594..9fc6e956963 100644 --- a/homeassistant/components/deconz/device_trigger.py +++ b/homeassistant/components/deconz/device_trigger.py @@ -417,7 +417,15 @@ async def async_validate_trigger_config(hass, config): or device.model not in REMOTES or trigger not in REMOTES[device.model] ): - raise InvalidDeviceAutomationConfig + if not device: + raise InvalidDeviceAutomationConfig( + f"deCONZ trigger {trigger} device with id " + f"{config[CONF_DEVICE_ID]} not found" + ) + raise InvalidDeviceAutomationConfig( + f"deCONZ trigger {trigger} is not valid for device " + f"{device} ({config[CONF_DEVICE_ID]})" + ) return config diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py index d58381a2f40..a9d44f2f860 100644 --- a/homeassistant/components/sensor/device_condition.py +++ b/homeassistant/components/sensor/device_condition.py @@ -169,7 +169,10 @@ async def async_get_condition_capabilities(hass, config): ) if not state or not unit_of_measurement: - raise InvalidDeviceAutomationConfig + raise InvalidDeviceAutomationConfig( + "No state or unit of measurement found for " + f"condition entity {config[CONF_ENTITY_ID]}" + ) return { "extra_fields": vol.Schema( diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py index 77f6afd9acf..86dda53cd2b 100644 --- a/homeassistant/components/sensor/device_trigger.py +++ b/homeassistant/components/sensor/device_trigger.py @@ -168,7 +168,10 @@ async def async_get_trigger_capabilities(hass, config): ) if not state or not unit_of_measurement: - raise InvalidDeviceAutomationConfig + raise InvalidDeviceAutomationConfig( + "No state or unit of measurement found for " + f"trigger entity {config[CONF_ENTITY_ID]}" + ) return { "extra_fields": vol.Schema(