From 0ef7219e2945468c62fee32825ca5a03c859478d Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 19 Jan 2026 11:36:09 +0100
Subject: [PATCH] SCPN1-10047

---
 RPtoRFX_Receipt.ftl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index bd37d24..c4246f1 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -19,8 +19,11 @@
 		"receipt_reason_code": "${receipt_reason_code}",
 		"work_mode_code" :     "${work_mode_code}",
 		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
-		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
-
+		<#if executionflow.Carrier.ActorID?? && executionflow.Carrier.ActorID!="">
+			"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
+		<#else>
+			"carrier_code"   : "",
+		</#if>
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>