Guard for None entity config (#24838)

2019-06-28 22:23:00 -07:00 · 2019-06-28 22:23:00 -07:00 · b3963e56ec
commit b3963e56ec
parent c6e8e2398c
2 changed files with 2 additions and 2 deletions
--- a/homeassistant/components/alexa/smart_home_http.py
+++ b/homeassistant/components/alexa/smart_home_http.py
@ -52,7 +52,7 @@ class AlexaConfig(AbstractConfig):
    @property
    def entity_config(self):
        """Return entity config."""
-        return self._config.get(CONF_ENTITY_CONFIG, {})
+        return self._config.get(CONF_ENTITY_CONFIG) or {}

    def should_expose(self, entity_id):
        """If an entity should be exposed."""
--- a/homeassistant/components/cloud/google_config.py
+++ b/homeassistant/components/cloud/google_config.py
@ -24,7 +24,7 @@ class CloudGoogleConfig(AbstractConfig):
    @property
    def entity_config(self):
        """Return entity config."""
-        return self._config.get(CONF_ENTITY_CONFIG)
+        return self._config.get(CONF_ENTITY_CONFIG) or {}

    @property
    def secure_devices_pin(self):