diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py index 22435fadc16..7fb76f3af41 100644 --- a/homeassistant/components/mobile_app/device_tracker.py +++ b/homeassistant/components/mobile_app/device_tracker.py @@ -145,9 +145,9 @@ class MobileAppEntity(DeviceTrackerEntity, RestoreEntity): attr = state.attributes data = { - ATTR_GPS: (attr[ATTR_LATITUDE], attr[ATTR_LONGITUDE]), - ATTR_GPS_ACCURACY: attr[ATTR_GPS_ACCURACY], - ATTR_BATTERY: attr[ATTR_BATTERY_LEVEL], + ATTR_GPS: (attr.get(ATTR_LATITUDE), attr.get(ATTR_LONGITUDE)), + ATTR_GPS_ACCURACY: attr.get(ATTR_GPS_ACCURACY), + ATTR_BATTERY: attr.get(ATTR_BATTERY_LEVEL), } data.update({key: attr[key] for key in attr if key in ATTR_KEYS}) self._data = data diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index d74fea43c29..ed2749262bd 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -153,10 +153,10 @@ class OwnTracksEntity(DeviceTrackerEntity, RestoreEntity): attr = state.attributes self._data = { 'host_name': state.name, - 'gps': (attr[ATTR_LATITUDE], attr[ATTR_LONGITUDE]), - 'gps_accuracy': attr[ATTR_GPS_ACCURACY], - 'battery': attr[ATTR_BATTERY_LEVEL], - 'source_type': attr[ATTR_SOURCE_TYPE], + 'gps': (attr.get(ATTR_LATITUDE), attr.get(ATTR_LONGITUDE)), + 'gps_accuracy': attr.get(ATTR_GPS_ACCURACY), + 'battery': attr.get(ATTR_BATTERY_LEVEL), + 'source_type': attr.get(ATTR_SOURCE_TYPE), } @callback