Merge e06f3a4 into 0e36b26

home-assistant · Mar 7, 2019 · 27a7b27 · 27a7b27
2 parents 0e36b26 + e06f3a4
commit 27a7b27
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py
@@ -107,10 +107,15 @@ def _device_for_type(host, type_):
     def _fill_device_lists():
         for dev in devices.values():
             if isinstance(dev, SmartPlug):
-                if dev.is_dimmable:  # Dimmers act as lights
-                    lights.append(dev)
-                else:
-                    switches.append(dev)
+                try:
+                    if dev.is_dimmable:  # Dimmers act as lights
+                        lights.append(dev)
+                    else:
+                        switches.append(dev)
+                except SmartDeviceException as ex:
+                    _LOGGER.error("Unable to connect to device %s: %s",
+                                  dev.host, ex)
+
             elif isinstance(dev, SmartBulb):
                 lights.append(dev)
             else: