diff --git a/RFXtoRP_HfDtlStockLs.ftl b/RFXtoRP_HfDtlStockLs.ftl
index 1c514ab..28d6d61 100644
--- a/RFXtoRP_HfDtlStockLs.ftl
+++ b/RFXtoRP_HfDtlStockLs.ftl
@@ -50,11 +50,11 @@
 
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported">
+      <#stop >
       <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 
diff --git a/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl
index ee9990d..39f6d2f 100644
--- a/RFXtoRP_HfGrade.ftl
+++ b/RFXtoRP_HfGrade.ftl
@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,11 +9,11 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Grades">	
+		<#stop "no generic FTL file available yet for Grades">
 	<#break>
-	        
-	    
+
+
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 
diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl
index 584df9a..f9b3b04 100644
--- a/RFXtoRP_HfLvTypeList.ftl
+++ b/RFXtoRP_HfLvTypeList.ftl
@@ -16,6 +16,6 @@
 
 
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 
diff --git a/RFXtoRP_HfOwner.ftl b/RFXtoRP_HfOwner.ftl
index 571248a..6d23fd2 100644
--- a/RFXtoRP_HfOwner.ftl
+++ b/RFXtoRP_HfOwner.ftl
@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,11 +9,11 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Owners">	
+		<#stop "no generic FTL file available yet for Owners">
 	<#break>
-	        
-	    
+
+
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 
diff --git a/RFXtoRP_HfRpConfig.ftl b/RFXtoRP_HfRpConfig.ftl
index 8792d92..0d0751e 100644
--- a/RFXtoRP_HfRpConfig.ftl
+++ b/RFXtoRP_HfRpConfig.ftl
@@ -4,7 +4,7 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of
 *** -->
 
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -16,18 +16,18 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign file = JsonUtil.jsonToMap(dataRfx)>
-     
+
       <#include "RFXtoRP_RfxConfigurationRp.ftl">
-                
+
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#stop "deletion of config not supported">
       <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 
diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl
index aa2c627..e2c6966 100644
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -52,11 +52,11 @@
 
   <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported - Case D ">
+      <#stop>
       <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop>
 </#switch>
 
diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl
index 13d3698..0582ada 100644
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -71,11 +71,11 @@
 
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported - Case D ">
+      <#stop >
       <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop>
 </#switch>
 
diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 85deef4..cbea0cb 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -64,7 +64,7 @@
                <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
                }
             </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number && despatched_ipg.consignment_unit_id="" >
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
@@ -102,9 +102,9 @@
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
+<#stop>
 <#break>
 
 <#default>
-<#stop "event not supported">
+<#stop>
 </#switch>
\ No newline at end of file
diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl
index f6a0241..e329d46 100644
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -29,17 +29,17 @@
               <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
             }
            <#else>
-            <#stop "preparation order already confirmed">
+           <#-- preparation order already confirmed -->
+            <#stop>
            </#if>
 
           <#else>
-          <#stop "preparation order type not supported">
+          <#-- preparation order type not supported -->
+          <#stop>
           </#if>
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-
-
        ]
   <#break>