diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 6fbbd24..efd82d9 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -48,18 +48,14 @@
                     <#stop "Preparation order list is empty">
                 </#if>
             <#else>
-                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                    <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
-                        <#if dispute.dispute_reception.reception_type_code=="030">
-                            "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" >
+                    <#if dispute.dispute_reception.reception_type_code=="030">
+                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="070">
+                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
                         <#else>
-                            <#if dispute.dispute_reception.reception_type_code=="070">
-                                "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                            <#else>
-                                <#stop "Reference reception is empty">
-                            </#if>
-                        <#else>
-                            <#stop "Type not supported">
+                            <#stop "Reference reception is empty or type not supported">
                         </#if>
                     </#if>
                 </#if>