diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index 8f09d9c..06bc6c2 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -35,18 +35,20 @@
 
         <#-- if Reflex WMS is not structured    -->
         <#else> 
+          <#if actor.address?? >
 
-        "Name": "${actor.address.company_name?json_string}",
-        "StreetAddressOne" : "${actor.address.address_1?json_string}",
-        "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-        "StreetAddressThree" : "${actor.address.address_3?json_string}"       
-         
+            "Name": "${actor.address.company_name?json_string}",
+            "StreetAddressOne" : "${actor.address.address_1?json_string}",
+            "StreetAddressTwo" : "${actor.address.address_2?json_string}",
+            "StreetAddressThree" : "${actor.address.address_3?json_string}"       
+          </#if> 
         </#if> 
        },  
-      
-    "Phones": ["${actor.address.telephone?json_string}", 
+    <#if  actor.address?? > 
+      "Phones": ["${actor.address.telephone?json_string}", 
                "${actor.address.other_number?json_string}"
-              ],  
+              ], 
+    </#if>
     "Typology": "TYPOLOGY_UNKNOWN"
       }
   }
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index a4e5d12..5a219ad 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -34,16 +34,20 @@
           
         <#-- if Reflex WMS address is not structured    -->
         <#else>
-          "Name": "${actor.optional_attributes.company_name?json_string}",
-          "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
-          "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
-          "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
+          <#if actor.optional_attributes?? >
+            "Name": "${actor.optional_attributes.company_name?json_string}",
+            "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
+            "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
+            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
+          </#if>
         </#if>
                  
          },
-      "Phones": ["${actor.optional_attributes.telephone?json_string}", 
-                 "${actor.optional_attributes.other_number?json_string}"
-                ],
+      <#if actor.optional_attributes?? >
+        "Phones": ["${actor.optional_attributes.telephone?json_string}", 
+                  "${actor.optional_attributes.other_number?json_string}"
+                  ],
+      </#if>
        "Typology": "TYPOLOGY_UNKNOWN"
        }
   }