From c69f37500a9d14bf2e16f275cdc3d8d8e3a52ee7 Mon Sep 17 00:00:00 2001
From: Josh Anderson <andersonshatch@gmail.com>
Date: Sun, 15 Apr 2018 15:25:30 +0200
Subject: [PATCH] Restore typeerror check for units sans energy tracking
 (#13824)

---
 homeassistant/components/switch/edimax.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py
index 49eb5d32110..40ebb54b603 100644
--- a/homeassistant/components/switch/edimax.py
+++ b/homeassistant/components/switch/edimax.py
@@ -84,12 +84,12 @@ class SmartPlugSwitch(SwitchDevice):
         """Update edimax switch."""
         try:
             self._now_power = float(self.smartplug.now_power)
-        except ValueError:
+        except (TypeError, ValueError):
             self._now_power = None
 
         try:
             self._now_energy_day = float(self.smartplug.now_energy_day)
-        except ValueError:
+        except (TypeError, ValueError):
             self._now_energy_day = None
 
         self._state = self.smartplug.state == 'ON'