diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl
index 8b37074..8bc9f6e 100644
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -36,7 +36,8 @@
                 <#stop>
               </#if>
             <#else>
-              <#stop "Reference is empty">
+              <#--  "Reference is empty"-->
+              <#stop>
             </#if>
           </#if>
        ]
diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl
index 9884ec8..c2bf457 100644
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -57,8 +57,8 @@
                         }
                         ]
                       <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
+                        <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty-->
+                        <#stop >
                      </#if>
                <#else>
                   <#stop>
diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index ae9ca29..6c9401d 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -65,7 +65,8 @@
             </#if>
          </#if>
       <#else>
-         <#stop "PRO reference is empty">
+         <#--PRO reference is empty-->
+         <#stop >
       </#if>
       ]
       <#break>
diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 5bbd320..a6ef2b0 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -96,7 +96,8 @@
             <#assign refIDHmap ={}>
          ]
    <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop >
    </#if>
 
 
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 394713c..bb09270 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -81,7 +81,8 @@
             </#if>
           </#if>
         <#else>
-          <#stop "Receipt reference is empty">
+          <#-- Receipt reference is empty-->
+          <#stop >
         </#if>
        ]
       <#break>
@@ -100,7 +101,8 @@
             <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
           }
         <#else>
-          <#stop "Receipt reference is empty">
+           <#-- Receipt reference is empty-->
+          <#stop >
         </#if>
        ]
          <#break>