Index: AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml
===================================================================
diff -u -r49701 -r49704
--- AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(.../LeverAdresUtils.cls.xml)	(revision 49701)
+++ AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(.../LeverAdresUtils.cls.xml)	(revision 49704)
@@ -79,8 +79,8 @@
 				#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ..LeveradresRepository.GeefViaAXLeverAdresId(Address.LocationId)
 				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
 				Set InsertOfUpdate = "Update"
-				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",1),BestaandLeverAdres.GeefNaam()))
-				Do Adres.ZetAanspreking($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",2),BestaandLeverAdres.GeefAanspreking()))
+				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),Address.Description,BestaandLeverAdres.GeefNaam()))
+				Do Adres.ZetAanspreking("")
 				Do Adres.ZetStraat($$$If($$$HasLength(Address.Street),Address.Street,BestaandLeverAdres.GeefStraat()))
 				Do Adres.ZetPostcode($$$If($$$HasLength(Address.ZipCode),Address.ZipCode,BestaandLeverAdres.GeefPostcode()))
 				Do Adres.ZetGemeente($$$If($$$HasLength(Address.City),Address.City,BestaandLeverAdres.GeefGemeente()))
@@ -93,7 +93,7 @@
 				Do Adres.ZetOpmerking2($$$If($$$HasLength(Address.Nota2External),Address.Nota2External,BestaandLeverAdres.GeefOpmerking2()))
 				Do Adres.ZetType($$$If($$$HasLength(Address.Role),..AxToAdminUtils.ConvertLeverAdresType(Address.Role),BestaandLeverAdres.GeefType()))
 				Do Adres.ZetAxLeveradresId($$$If($$$HasLength(Address.LocationId),Address.LocationId,BestaandLeverAdres.GeefAxLeveradresId()))
-				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),$Piece(Address.TransporterAuth,"$$##",1),BestaandLeverAdres.GeefVolmacht()))
+				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),Address.TransporterAuth,BestaandLeverAdres.GeefVolmacht()))
 				Do ..LeveradresRepository.Bewaar(Klant, Adres)
 				Do ##class(TECH.ListUtils).RemoveItemFromList(Address.LocationId,LijstVanAxLocationIds)
 			}
@@ -132,7 +132,7 @@
 	Do Adres.ZetOpmerking2(Address.Nota2External)
 	Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
 	Do Adres.ZetAxLeveradresId(Address.LocationId)
-	Do Adres.ZetVolmacht($Piece(Address.TransporterAuth,"$$##",1))
+	Do Adres.ZetVolmacht(Address.TransporterAuth)
 	Quit Adres
 ]]></Implementation>
 </Method>
@@ -142,8 +142,8 @@
 <Private>1</Private>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
-	Do Adres.ZetNaam($Piece(Address.Description," ",1))
-	Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
+	Do Adres.ZetNaam(Address.Description)
+	Do Adres.ZetAanspreking("")
 	Do Adres.ZetStraat(Address.Street)
 	Do Adres.ZetPostcode(Address.ZipCode)
 	Do Adres.ZetGemeente(Address.City)
Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils/ZetLeverAdressenBestaandeKlant/Test.cls.xml
===================================================================
diff -u -r49701 -r49704
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils/ZetLeverAdressenBestaandeKlant/Test.cls.xml	(.../Test.cls.xml)	(revision 49701)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils/ZetLeverAdressenBestaandeKlant/Test.cls.xml	(.../Test.cls.xml)	(revision 49704)
@@ -199,6 +199,22 @@
 </Method>
 
 <Method name="Test: 1 PostalAddress heeft niet de Delivery-rol en AxLocationId is niet gekend: negeren">
+<Implementation><![CDATA[
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..MaakKlantMetLeveradressenMetAxLocationIds("")
+	
+	Set LeverAdresFactoryStub = ##class(vhTest.Mock.DOM.VKP.impl.LeverAdresFactory).%New()
+	Set LandRepository = ##class(vhTest.Mock.DOM.common.Locatie.impl.LandRepository).%New()
+	
+	Set LeverAdresRepositoryMock = ##class(vhTest.Mock.DOM.VKP.impl.LeverAdresRepository).%New()
+	Do LeverAdresRepositoryMock.VerwachtMethodCall("BestaatViaAXLeverAdresId",..#AxLocationId1).ExactAantalKeer(0)
+	
+	Set LeverAdresUtils = ##class(AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils).%New(LandRepository,,LeverAdresFactoryStub,LeverAdresRepositoryMock)
+	#dim InkomendeAxCustomer As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCustMetAxLocationIds($lb(..#AxLocationId1))
+	Set InkomendeAxCustomer.PostalAddress.GetAt(1).Role.GetAt(1).Name = "NotDelivery"
+	Do LeverAdresUtils.ZetLeverAdressenBestaandeKlant(Klant,InkomendeAxCustomer)
+	
+	Do LeverAdresRepositoryMock.Verifieer()
+]]></Implementation>
 </Method>
 
 <Method name="MaakKlantMetLeveradressenMetAxLocationIds">