diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 40f5c24..41f0e55 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -8,7 +8,12 @@
         },
         "ID": {
             <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+
             <#else>
                 <#if dispute.dispute_reception??>
                 "RefID": "${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_year_number?json_string}${dispute.dispute_number?json_string}"
@@ -36,7 +41,11 @@
                 "Value": "${dispute.dispute_amount}"
              },
             <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#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}",
@@ -48,7 +57,7 @@
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
 
             <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"TableReasonCode[dispute.dispute_reason_code]"
             <#else>
                 <#stop "Claim reason code not supported" >
             </#if>
diff --git a/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
index b1fd7d7..9b2f13a 100644
--- a/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
+++ b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
@@ -1,12 +1,5 @@
 <#-- Specify table for reason code -->
-<#-- Table example for reason code to claim type ID -->
-<#-- <#assign TableReasonCode = {
-    "001":"ORDER_Delay",
-    "M1":"ORDER_casse",
-    "XXX":"ACTOR_claimtype",
-    "XXX":"HANDLINGUNIT_claimtype",
-    "XXX":"MOVEMENT_claimtype"
- }/>-->
+<#assign TableReasonCode = {}/>