diff --git a/Tasks/AddressCreation.cs b/Tasks/AddressCreation.cs
index 64c2fb1..873cccc 100644
--- a/Tasks/AddressCreation.cs
+++ b/Tasks/AddressCreation.cs
@@ -15,13 +15,17 @@ public static class AddressCreator
         // Maximum seven lines of information
 
         // find the address
-        var address = new KasPerson();
+        KasPerson? address = null;
         var string_address = "";
         var address_line_count = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
         {
             var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
-            if (temp != null) break;
+            if (temp != null)
+            {
+                address = temp;
+                break;
+            }
         }
 
         // no address found
@@ -91,13 +95,17 @@ public static class AddressCreator
         // Maximum seven lines of information
 
         // find the address
-        var address = new KasPerson();
+        KasPerson? address = null;
         var string_address = "";
         var address_line_count = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
         {
             var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
-            if (temp != null) break;
+            if (temp != null)
+            {
+                address = temp;
+                break;
+            }
         }
 
         // no address found