From c89e9d87e87e661920f7526f29d8199a4ea4650c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 17 Apr 2016 22:07:53 -0700
Subject: [PATCH] Catch platform setup error (#1847)

---
 homeassistant/helpers/entity_component.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index 0bcebd8dcdb..43d6e435509 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -79,6 +79,9 @@ class EntityComponent(object):
         platform = prepare_setup_platform(
             self.hass, self.config, self.domain, platform_type)
 
+        if platform is None:
+            return
+
         # Config > Platform > Component
         scan_interval = platform_config.get(
             CONF_SCAN_INTERVAL,