diff --git a/hyundai_kia_connect_api/Vehicle.py b/hyundai_kia_connect_api/Vehicle.py
index 26545494..3157284a 100644
--- a/hyundai_kia_connect_api/Vehicle.py
+++ b/hyundai_kia_connect_api/Vehicle.py
@@ -313,8 +313,12 @@ def geocode(self):
 
     @geocode.setter
     def geocode(self, value):
-        self._geocode_name = value[0]
-        self._geocode_address = value[1]
+        if value:
+            self._geocode_name = value[0]
+            self._geocode_address = value[1]
+        else:
+            self._geocode_name = None
+            self._geocode_address = None
 
     @property
     def total_driving_range(self):