diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index c800639..2373749 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -55,7 +55,7 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				<#if executionflow.ShipTo.Actor.Adresse.Name??>
+				<#if executionflow.ShipTo.Actor.Adresse.Name?? && executionflow.ShipTo.Actor.Adresse.Name!="">
 					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Adresse.Name!"")?json_string}",
 				<#else>
 					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}${(executionflow.ShipTo.Contact.LastName!"")?json_string}"