NPE in CRM Contact addresses returned by VirtuousCrmService

impactupgrade · Jun 26, 2023 · c57c4f1 · c57c4f1
1 parent 6d59bd9
commit c57c4f1
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/main/java/com/impactupgrade/nucleus/service/segment/VirtuousCrmService.java b/src/main/java/com/impactupgrade/nucleus/service/segment/VirtuousCrmService.java
@@ -269,15 +269,16 @@ private String getContactMethodValue(VirtuousClient.ContactIndividual contactInd
     }
 
     private CrmAddress getCrmAddress(VirtuousClient.Address address) {
-        if (address == null) {
-            return null;
-        }
         CrmAddress crmAddress = new CrmAddress();
-        crmAddress.country = address.country;
-        crmAddress.state = address.state;
-        crmAddress.city = address.city;
-        crmAddress.postalCode = address.postal;
-        crmAddress.street = address.address1;
+
+        if (address != null) {
+            crmAddress.country = address.country;
+            crmAddress.state = address.state;
+            crmAddress.city = address.city;
+            crmAddress.postalCode = address.postal;
+            crmAddress.street = address.address1;
+        }
+
         return crmAddress;
     }