diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl
index c2d33a9..1f22d6b 100644
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -37,7 +37,7 @@
             "LVID": "${logistical_variant.logistical_variant_code?json_string}",
             "Name" : "${logistical_variant.lv_type_code?json_string}",
 
-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
index 7f4269d..1ea0c2b 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -23,7 +23,7 @@
   <#else>
     <#if receipt.line_list??>
       <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
           <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
             <#if refIDHmap_local?size != 0 >
             ,
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
index 6f0e002..e8b647d 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -23,7 +23,7 @@
   <#else>
     <#if receipt.line_list??>
       <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
           <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
             <#if refIDHmap_local?size != 0 >
             ,
diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
index f8df01b..3ffb8c4 100644
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -23,7 +23,7 @@
   <#else>
     <#if receipt.line_list??>
       <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
           <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
             <#if refIDHmap_local?size != 0 >
             ,