diff --git a/core/managers.py b/core/managers.py
index 844073b7..b0bc62d1 100644
--- a/core/managers.py
+++ b/core/managers.py
@@ -52,10 +52,20 @@ class AddressManager(models.Manager):
 
         logger.debug("Address creation kwargs: %s", kwargs)
 
+        try:
+            address_line_1 = kwargs.pop('address_line_1')
+        except KeyError:
+            raise ValueError("Missing required field 'address_line_1'") from e
+
+        try:
+            address_line_2 = kwargs.pop('address_line_2')
+        except KeyError:
+            address_line_2 = ""
+
         # Create the model instance, storing both the input string and full API response
         return super().create(
             raw_data=raw_data,
-            address_line=f"{kwargs.get('address_line_1')}, {kwargs.get('address_line_2')}",
+            address_line=f"{address_line_1}, {address_line_2}",
             street=street,
             district=district,
             city=city,