Index: DOM/common/Locatie/impl/LandRepository.cls.xml
===================================================================
diff -u -r35616 -r35618
--- DOM/common/Locatie/impl/LandRepository.cls.xml	(.../LandRepository.cls.xml)	(revision 35616)
+++ DOM/common/Locatie/impl/LandRepository.cls.xml	(.../LandRepository.cls.xml)	(revision 35618)
@@ -18,7 +18,9 @@
 <Method name="BestaatViaID">
 <FormalSpec>LandID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $data(^ISO(0,"ISO.LAND",LandID,0))
+<Implementation><![CDATA[
+	Quit:$$$HasLength(LandID) $data(^ISO(0,"ISO.LAND",LandID,0))
+	Quit $$$False
 ]]></Implementation>
 </Method>
 
@@ -39,6 +41,23 @@
 <Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Landen zijn read-only"))
 ]]></Implementation>
 </Method>
+
+<Method name="GeefViaLandCode2Lang">
+<FormalSpec>LandCodeIn:%String</FormalSpec>
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[
+	#dim LandID As %String = ""
+	#dim LandCode As %String = ""
+	
+	For { Quit:$$$HasLength(LandID)  Set LandCode=$Order(^ISO(0,"ISO.LAND",LandCode))  Quit:(LandCode="")		
+		If $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",1) = LandCodeIn {			
+			Set LandID = LandCode
+		}
+	}
+	
+	Quit ..GeefViaID(LandID)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r35613 -r35618
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35613)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35618)
@@ -28,8 +28,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LocatieAPI">
-<Type>DOM.common.LocatieAPI</Type>
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
 </Property>
 
@@ -54,7 +54,7 @@
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	
 	set ..Utils = ##class(AXimpl.AifMessage.Converter.Utils).%New(..FirmaBepaler,..PartijAPI)
-	set ..LocatieAPI = ##class(DOM.common.impl.LocatieAPI).%New()
+	set ..LandRepository = ##class(DOM.common.Locatie.impl.LandRepository).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -205,7 +205,7 @@
 		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()	
 		Set FictiefPostalAddres.class = "entity"	
 		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
-		Set FictiefPostalAddres.CountryRegionId = ..LocatieAPI.ConvertLandCode2naar3(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
+		Set FictiefPostalAddres.CountryRegionId = ..LandRepository.GeefViaLandCode2Lang(..LandCodeUitBTWNummer(Partij.GeefBTWNr())).GeefIso3()
 		Set FictiefPostalAddres.Roles = "Business"
 		Set FictiefPostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.LocationName = DirParty.Name
Index: vhUnitTest/DOM/common/Locatie/impl/LandRepository/Test.cls.xml
===================================================================
diff -u -r35616 -r35618
--- vhUnitTest/DOM/common/Locatie/impl/LandRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 35616)
+++ vhUnitTest/DOM/common/Locatie/impl/LandRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 35618)
@@ -26,14 +26,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Probeer een land te geven met &apos;&apos;">
+<Implementation><![CDATA[
+	#dim Land As DOM.common.Land
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen land gevonden met id ''")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
+	
+	Set Land = ..LandRepository.GeefViaID("")
+	
+	Do $$$AssertEquals(Land.GeefID(),1019,"")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Geef een Land via onbestaand ID">
 <Implementation><![CDATA[
 	#dim Land As DOM.common.Land
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen land gevonden met id '9999'")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
 	
-	Set Land = ..LandRepository.GeefViaID(9999)
+	Set Land = ..LandRepository.GeefViaID("9999")
 ]]></Implementation>
 </Method>
 
@@ -64,6 +77,23 @@
 	Do ..LandRepository.Maak()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefViaLandCode2Lang BE">
+<Implementation><![CDATA[
+	#dim Land As DOM.common.Land = ..LandRepository.GeefViaLandCode2Lang("BE")
+	
+	Do $$$AssertEquals(Land.GeefID(),1019,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaLandCode2Lang onbestaand">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen land gevonden met id ''")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
+	
+	#dim Land As DOM.common.Land = ..LandRepository.GeefViaLandCode2Lang("XXX")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/common/impl/LocatieAPI.cls.xml
===================================================================
diff -u -r35613 -r35618
--- DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35613)
+++ DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35618)
@@ -52,23 +52,6 @@
 	Quit ..GeefLand($$LAND^vhRtn1(LandCode,"I"))
 ]]></Implementation>
 </Method>
-
-<Method name="ConvertLandCode2naar3">
-<FormalSpec>LandCodeIn:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim LandCodeUit As %String = ""
-	#dim LandCode As %String = ""
-	
-	For { Quit:$$$HasLength(LandCodeUit)  Set LandCode=$Order(^ISO(0,"ISO.LAND",LandCode))  Quit:(LandCode="")		
-		If $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",1) = LandCodeIn {			
-			Set LandCodeUit = $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",35)
-		}
-	}
-	
-	Quit LandCodeUit
-]]></Implementation>
-</Method>
 </Class>