diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index 042b49b..a1c4709 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -33,9 +33,9 @@
                "datas" :
                   <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
                }
-               <#else>
+            <#else>
                   <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                        {
                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -48,18 +48,18 @@
                         "datas" :
                            <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                      }
-                  <#else>
+               <#else>
                      <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
                         {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
                            <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
                         }
-                     <#else>
+                  <#else>
                         <#stop>
-                     </#if>
+                  </#if>
                </#if>
             </#if>
          </#if>
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 5fcdffb..840b0f8 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -35,10 +35,10 @@
 
           }
           ]
-          </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
         </#if>
+      <#else>
+        <#stop "Receipt reference is empty">
+      </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->