diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl
index 7ddcb37..2a0232a 100644
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -18,12 +18,17 @@
        [
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+            <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
             }
+            <#else>
+              <#-- no line list -->
+              <#stop>
+            </#if>
           <#else>
           <#-- preparation order type not supported -->
             <#stop>
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index fbab28b..c932637 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,7 +15,7 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer reception -->
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer type -->
           [
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>