diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index 4412001..1c838f8 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -5,7 +5,7 @@
 [
   <#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 >
           ,
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index 4412001..1c838f8 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -5,7 +5,7 @@
 [
   <#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 >
           ,
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 4412001..1c838f8 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -5,7 +5,7 @@
 [
   <#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 >
           ,
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"