diff --git a/RFXtoRP_HsaCarrier_ActorUpdated.ftl b/RFXtoRP_HsaCarrier_ActorUpdated.ftl
index fa06416..f6ad18c 100644
--- a/RFXtoRP_HsaCarrier_ActorUpdated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorUpdated.ftl
@@ -12,11 +12,11 @@
       "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c},
       "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c},
       "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipFromConnected>
+      <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected>
       "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}",
       </#if>
       "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipToConnected>
+      <#if actorRP.Objects[0].Payload.IsShipToConnected?? &&  actorRP.Objects[0].Payload.IsShipToConnected>
       "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}",
       </#if>
       "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}",