diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index fb66661..499d4f4 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -47,18 +47,26 @@
                     <#if TableReasonCode[dispute.dispute_reason_code]??>
                         "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
                     <#else>
-                        <#stop "preparation order list is empty" >
+                        <#stop "Reason code not supported">
                     </#if>
+                <#else>
+                    <#stop "Preparation order list is empty">
                 </#if>
             <#else>
                 <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                    <#if TableReasonCode[dispute.dispute_reason_code]??>
-                        "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
+                    <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
+                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        <#if TableReasonCode[dispute.dispute_reason_code]??>
+                            "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
+                        <#else>
+                            <#stop "Reason code not supported">
+                        </#if>
                     <#else>
-                        <#stop "Type not supported" >
+                        <#stop "Reception reference is empty">
                     </#if>
                 </#if>
+            <#else>
+                    <#stop "Type not supported">
             </#if>
         }
     }