From e9d767a3146220c8c825b6bd1066b8e8e99799b3 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 20 May 2017 22:38:01 -0700 Subject: [PATCH] Guard against new and removed state change events --- homeassistant/components/automation/state.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/automation/state.py b/homeassistant/components/automation/state.py index 185d44808c3858..fbd1570a1e0cf7 100644 --- a/homeassistant/components/automation/state.py +++ b/homeassistant/components/automation/state.py @@ -45,6 +45,7 @@ def async_trigger(hass, config, action): time_delta = config.get(CONF_FOR) async_remove_state_for_cancel = None async_remove_state_for_listener = None + match_all = (from_state == MATCH_ALL and to_state == MATCH_ALL) @callback def clear_listener(): @@ -77,8 +78,8 @@ def call_action(): }) # Ignore changes to state attributes if from/to is in use - match_all = (from_state == MATCH_ALL and to_state == MATCH_ALL) - if not match_all and from_s.last_changed == to_s.last_changed: + if (not match_all and from_s is not None and to_s is not None and + from_s.last_changed == to_s.last_changed): return if time_delta is None: