Merge c275616 into 7807b40

home-assistant · Mar 16, 2019 · 00bf1e5 · 00bf1e5
2 parents 7807b40 + c275616
commit 00bf1e5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/homeassistant/components/weather/darksky.py b/homeassistant/components/weather/darksky.py
@@ -232,4 +232,6 @@ def update(self):
     @property
     def units(self):
         """Get the unit system of returned data."""
+        if self.data is None:
+            return None
         return self.data.json.get('flags').get('units')