Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r46905 -r47103
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 46905)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 47103)
@@ -70,26 +70,28 @@
 			Set ProductId = Attribute.ValueTxt	
 		}
 	}
-
-	If ($$$Not(ProductId = "") && (..ProductApi.BestaatProduct(ProductId))) {
-		Set Product = ..ProductApi.GeefProduct(ProductId)
-	}	
 	
-	If ((ProductId = "") && (..ProductApi.BestaatIdentNr(Request.ItemId))) {
-		Set Product = ..ProductApi.GeefProductVolgensIdentNr(Request.ItemId)
+	Try {
+		If (ProductId = "") {
+			Set ProductId = ..ProductApi.GeefProductIdVoorIdentNummer(Request.ItemId)
+		}
+		
+		Set Product = ..ProductApi.GeefProduct(ProductId)
+			
+		If $$$Not(ProductId = "") {
+			Set ConfigVariant.GTIN = Product.GeefEANCode()
+			Set ConfigVariant.ProductName = Product.GeefKorttekst()
+			Set ConfigVariant.CostPrice = ..Formatter.FormatNumber(Product.GeefNettoAankoopPrijsInclCif(), 2)
+			Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.ConfigVariantId)
+			Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product, ConfigVariant.ConfigVariantId)
+			Set ConfigVariant.SourcingDataAreaId = ..SourcingDataAreaIdBepaler.Bepaal(Product)
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
+		Set ConfigVariant.ErrorText = Exception.GeefOmschrijving()
 	}
 	
-	If $$$Not(Product = "") {		
-		Set ConfigVariant.GTIN = Product.GeefEANCode()
-		Set ConfigVariant.ProductName = Product.GeefKorttekst()
-		Set ConfigVariant.CostPrice = ..Formatter.FormatNumber(Product.GeefNettoAankoopPrijsInclCif(), 2)
-		Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.ConfigVariantId)
-		Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product, ConfigVariant.ConfigVariantId)
-		Set ConfigVariant.SourcingDataAreaId = ..SourcingDataAreaIdBepaler.Bepaal(Product)
-	} Else {
-		Set ConfigVariant.ErrorText = ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound()	
-	}
-	
 	Quit ConfigVariant
 ]]></Implementation>
 </Method>
Index: DOM/PM/impl/ProductAPI.cls.xml
===================================================================
diff -u -r45894 -r47103
--- DOM/PM/impl/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 45894)
+++ DOM/PM/impl/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 47103)
@@ -124,6 +124,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIdentNummerVoorProductId">
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim IdentNummer As %String = ""
+	
+	If (..BestaatProduct(ProductId)) {
+		Set IdentNummer = ..GeefProduct(ProductId).GeefIdentNr()
+	} Else {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen Product gevonden met ProductId '" _ ProductId _ "'."))
+	}
+	
+	Quit IdentNummer
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductIdVoorIdentNummer">
+<FormalSpec>IdentNummer:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductId As %String = ""
+	
+	If (..BestaatIdentNr(IdentNummer)) {
+		Set ProductId = ##class(Prod.Product).IdentNrToPRNr(IdentNummer)
+	} Else {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen Product gevonden met IdentNummer '" _ IdentNummer _ "'."))
+	}
+	
+	Quit ProductId
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductVolgensKorttekst">
 <FormalSpec>Korttekst:%String</FormalSpec>
 <ReturnType>DOM.PM.Product</ReturnType>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r45066 -r47103
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 45066)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47103)
@@ -3,7 +3,7 @@
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyInventTransId</ConfigVariantId>
-    <ErrorText>NotFound</ErrorText>
+    <ErrorText>Product OnbestaandProduct bestaat niet!</ErrorText>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
Index: DOM/PM/ProductAPI.cls.xml
===================================================================
diff -u -r45894 -r47103
--- DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 45894)
+++ DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 47103)
@@ -25,6 +25,18 @@
 <ReturnType>DOM.PM.Product</ReturnType>
 </Method>
 
+<Method name="GeefProductIdVoorIdentNummer">
+<Abstract>1</Abstract>
+<FormalSpec>IdentNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefIdentNummerVoorProductId">
+<Abstract>1</Abstract>
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefKorttekstUtils">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.KorttekstUtils</ReturnType>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r46905 -r47103
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46905)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47103)
@@ -41,7 +41,6 @@
 	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
 	
 	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", ..RandomProductId).DanReturn($$$True)
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..RandomProductId).DanReturn(ProductStub)
 	
 	#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
@@ -69,48 +68,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult ErrorText in indien geen bouwstenen gevonden worden">
+<Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
+	#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
-
+	Do ProductApiStub.IndienMethodCall("GeefProductIdVoorIdentNummer", $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
+	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, "RandomMessageId")
 	
-	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
+	Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult ErrorText in indien geen Product gevonden wordt voor opgegeven AdminProductNummer">
-<Implementation><![CDATA[
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
-	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, "RandomMessageId")
-	
-	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
-]]></Implementation>
-</Method>
-
-<Method name="Test: RequestConverter vult ErrorText in indien geen Product gevonden wordt voor opgegeven ItemId">
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	Set Request.ItemId = "OnbestaandeIdentNr"
-	
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
-	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
-	
-	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
-]]></Implementation>
-</Method>
-
 <Method name="Test: RequestConverter vult MessageId altijd in">
 <Implementation><![CDATA[
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
@@ -174,9 +145,10 @@
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	Set Request.ItemId = RandomIdentNr
 	
+	#dim RandomProductId As %String = "RandomProductId"
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", RandomIdentNr).DanReturn($$$True)
-	Do ProductApiStub.IndienMethodCall("GeefProductVolgensIdentNr", RandomIdentNr).DanReturn(ProductDummy)
+	Do ProductApiStub.VerwachtMethodCall("GeefProductIdVoorIdentNummer", RandomIdentNr).DanReturn(RandomProductId)
+	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId).DanReturn(ProductDummy)
 	
 	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
 	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn(RandomSourcingDataAreaId)		
@@ -185,6 +157,8 @@
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 	
 	Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, RandomSourcingDataAreaId)
+	
+	Do ProductApiStub.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml
===================================================================
diff -u -r45895 -r47103
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 45895)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 47103)
@@ -31,13 +31,14 @@
 	Set DummyRequest.InventTransId = RandomInventTransId
 	Set DummyRequest.MessageId = RandomRequestMessageId
 	
+	#dim RandomProductId As %String = "RandomProductId"
 	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProductIdVoorIdentNummer", RandomItemId).DanReturn(RandomProductId)
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", RandomProductId).DanReturn(BestaatProduct)
+	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId).DanReturn(ProductDummy)
 	
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn(BestaatProduct)
-	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductDummy)
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanDoeNiks()
-	
 	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
 	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductDummy, RandomItemId).DanReturn(##class(%ListOfObjects).%New())
 		
Index: vhTest/Mock/DOM/PM/ProductAPI.cls.xml
===================================================================
diff -u -r45895 -r47103
--- vhTest/Mock/DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 45895)
+++ vhTest/Mock/DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 47103)
@@ -45,6 +45,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIdentNummerVoorProductId">
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIdentNummerVoorProductId",ProductId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefKorttekstUtils">
 <ReturnType>DOM.PM.KorttekstUtils</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKorttekstUtils")
@@ -76,6 +83,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductIdVoorIdentNummer">
+<FormalSpec>IdentNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductIdVoorIdentNummer",IdentNr)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductIterator">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductIterator")