diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl
index 1d7302f..75cd22f 100644
--- a/ActorPrefix.ftl
+++ b/ActorPrefix.ftl
@@ -5,7 +5,7 @@
 
 <#-- For Depot -->
 <#function RFXtoRPprefixDepot depot>
-  <#if uniqueness >
+  <#if uniqueness?? && uniqueness >
     <#local actor = depot>
   <#else>
     <#if text_language_rfx ="fr">
@@ -34,7 +34,7 @@
 </#function>
 
 <#function RPtoRFXprefixDepot actor>
-  <#if uniqueness >
+  <#if uniqueness?? && uniqueness >
     <#local depot = actor>
   <#else>
     <#local depot = actor[4..]>
@@ -46,7 +46,7 @@
 
 <#-- For Supplier -->
 <#function RFXtoRPprefixSupplier supplier>
-  <#if uniqueness >
+  <#if uniqueness?? && uniqueness >
     <#local actor = supplier>
   <#else>
     <#if text_language_rfx ="fr">
@@ -75,7 +75,7 @@
 </#function>
 
 <#function RPtoRFXprefixSupplier actor>
-  <#if uniqueness >
+  <#if uniqueness?? && uniqueness >
     <#local supplier = actor>
   <#else>
     <#local supplier = actor[4..]>
@@ -85,7 +85,7 @@
 
 <#-- For Carrier -->
 <#function RFXtoRPprefixCarrier carrier>
-  <#if uniqueness >
+  <#if uniqueness?? && uniqueness >
     <#local actor = carrier>
   <#else>
     <#if text_language_rfx ="fr">
@@ -114,7 +114,7 @@
 </#function>
 
 <#function RPtoRFXprefixCarrier actor>
-  <#if uniqueness>
+  <#if uniqueness?? && uniqueness>
     <#local carrier = actor>
   <#else>
     <#local carrier = actor[4..]>
@@ -124,7 +124,7 @@
 
 <#-- For Consignee -->
 <#function RFXtoRPprefixConsignee consignee>
-  <#if uniqueness>
+  <#if uniqueness?? && uniqueness>
     <#local actor = consignee>
   <#else>
     <#if text_language_rfx ="fr">
@@ -153,7 +153,7 @@
 </#function>
 
 <#function RPtoRFXprefixConsignee actor>
-  <#if uniqueness>
+  <#if uniqueness?? && uniqueness>
     <#local consignee = actor>
   <#else>
     <#local consignee = actor[4..]>