Index: vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml
===================================================================
diff -u -r59584 -r60035
--- vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml	(.../Test.cls.xml)	(revision 59584)
+++ vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml	(.../Test.cls.xml)	(revision 60035)
@@ -51,30 +51,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertSupplierIDHLX default">
-<Implementation><![CDATA[
-	#dim SupplierID As %String = "9999"
-	#dim ConvertedLeverancierID As %String = ""
-	
-	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
-	Set ConvertedLeverancierID = Converter.ConvertSupplierIDHLX(SupplierID)
-	
-	Do $$$AssertEquals(ConvertedLeverancierID,"L||9999")
-]]></Implementation>
-</Method>
-
-<Method name="Test: ConvertSupplierIDHLX leeg">
-<Implementation><![CDATA[
-	#dim SupplierID As %String = ""
-	#dim ConvertedLeverancierID As %String = ""
-	
-	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
-	Set ConvertedLeverancierID = Converter.ConvertSupplierIDHLX(SupplierID)
-	
-	Do $$$AssertEquals(ConvertedLeverancierID,"")
-]]></Implementation>
-</Method>
-
 <Method name="Test: Convert ZuluTimeStamp voor zomertijd">
 <Implementation><![CDATA[
 	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
Index: AXimpl/AxToAdminUtils.cls.xml
===================================================================
diff -u -r59584 -r60035
--- AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 59584)
+++ AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 60035)
@@ -129,8 +129,11 @@
     Quit:SupplierId="06756" "L||8910"
     Quit:SupplierId="06773" "L||8924"
     Quit:SupplierId="06787" "L||6675"
+    Quit:SupplierId="06815" "L||6815"
+    Quit:SupplierId="05512" "L||5524"
     
-    Quit "L||"_+SupplierId
+    Do ##class(vhLib.Logger).%New().ErrorMail("AXToAdminUtils","Nieuwe leverancier met id '"_SupplierId_"' gedefinieerd in AX Halux, die nog niet voorzien is in ConvertSupplierIDHLX")
+	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe leverancier met id '"_SupplierId_"' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode."))
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler/Test.cls.xml
===================================================================
diff -u -r59584 -r60035
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 59584)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 60035)
@@ -159,6 +159,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test geeft bezwaar indien niet gekende halux leverancier">
+<Implementation><![CDATA[
+	#dim Bericht as AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut = ..GeefJournaal()
+	Set Bericht.JournalTable.GetAt(1).LegalEntityId = "hlx"
+	
+	Do ..ReceptieServiceIndienMethodCalls()
+	
+	#dim Bezwaren as %ListOfDataTypes = ..BezwarenBepaler.GeefBezwaren(Bericht)
+	
+	Do $$$AssertEquals(Bezwaren.Count(),1)
+	Do $$$AssertEquals(Bezwaren.GetAt(1),"Leverancier met SupplierID '01234' niet gekend voor Halux.")
+]]></Implementation>
+</Method>
+
 <Method name="Test geeft bezwaar indien vhbe leverancier niet gekend">
 <Implementation><![CDATA[
 	#dim Bericht as AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut = ..GeefJournaal()
Index: AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler.cls.xml
===================================================================
diff -u -r59584 -r60035
--- AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler.cls.xml	(.../ConversieBezwarenBepaler.cls.xml)	(revision 59584)
+++ AXimpl/Dynamics/InventoryIn/Converter/ConversieBezwarenBepaler.cls.xml	(.../ConversieBezwarenBepaler.cls.xml)	(revision 60035)
@@ -78,7 +78,13 @@
 
 			#dim LeverancierId as %String = ""
 			if (..CurrentLegalEntity = "hlx") && $Length(JournalEntryLine.CustVendAccount){
-				Set LeverancierId = ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(JournalEntryLine.CustVendAccount)
+				try { ;exception indien geen gekende hlx leverancier
+					Set LeverancierId = ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(JournalEntryLine.CustVendAccount)
+				} catch {
+					#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).%ClassName(1))
+					Set LeverancierId = ""
+					Do ..VoegToeBezwaar("Leverancier met SupplierID '" _ JournalEntryLine.CustVendAccount _ "' niet gekend voor Halux.")				
+				}
 			} else {
 				Set:$Length(JournalEntryLine.CustVendAccount) LeverancierId = ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(JournalEntryLine.CustVendAccount)
 			}