diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index a6ef2b0..b90dc7b 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -18,6 +18,7 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
    <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
          [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -95,6 +96,10 @@
             </#list>
             <#assign refIDHmap ={}>
          ]
+      <#else>
+         <#--   No line-->
+         <#stop >
+      </#if>
    <#else>
       <#--   no confirmed quantity for the preparation - preparation closed-->
       <#stop >
diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl
index 50491f8..783e7a0 100644
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -19,12 +19,17 @@
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-            }
+            <#if preparation_order.line_list??>
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+              }
+            <#else>
+              <#-- No line -->
+              <#stop>
+            </#if>
           <#else>
           <#-- preparation order type not supported -->
             <#stop>
@@ -42,12 +47,17 @@
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-        }
+          <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
         <#else>
           <#-- PRO reference is empty -->
           <#stop>
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 3843791..be3d0c9 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -17,8 +17,9 @@
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
         <#if receipt.receipt_type == "030">
-        <#stop "ignored message because receipt type = transfert">
+          <#stop "ignored message because receipt type = transfert">
         <#else>
+          <#if receipt.line_list ??>
           [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -35,11 +36,15 @@
 
           }
           ]
-        </#if>
-      <#else>
-        <#--  "Receipt reference is empty"-->
-        <#stop>
+          <#else>
+            <#--  No line-->
+            <#stop>
+          </#if>
       </#if>
+    <#else>
+      <#--  "Receipt reference is empty"-->
+      <#stop>
+    </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
@@ -66,18 +71,23 @@
               <#if receipt.receipt_type == "030">
                 <#stop "ignored message because receipt type = transfert">
               <#else>
-                {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                <#if receipt.line_list ??>
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-                },
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                }
+                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  }
+                <#else>
+                  <#--  No line-->
+                  <#stop>
+                </#if>
               </#if>
             </#if>
           </#if>
@@ -94,13 +104,18 @@
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          {
+          <#if receipt.line_list ??>
+            {
 
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+            }
+            <#else>
+              <#--  No line-->
+              <#stop>
+            </#if>
         <#else>
            <#-- Receipt reference is empty-->
           <#stop >