Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r43032 -r43041
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43032)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43041)
@@ -8,35 +8,75 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeAllTests">
+<Method name="Test: BouwstenenRepository wordt altijd opgeroepen">
 <Implementation><![CDATA[
-	Do ##super()
+	#dim RandomItemId As %String = "RandomItemId"
 	
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set DummyRequest.ItemId = RandomItemId
+	
+	#dim BouwstenenRepositoryMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New()
+	Do BouwstenenRepositoryMock.VerwachtMethodCall("BestaatViaID", RandomItemId)
+	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(BouwstenenRepositoryMock)
+	
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
+	
+	Do BouwstenenRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter geeft een AxdEntityConfigVariant terug">
+<Method name="Test: RequestConverter geeft altijd een AxdEntityConfigVariant terug">
 <Implementation><![CDATA[
+	#dim BouwstenenRepositoryStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New()
+	Do BouwstenenRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde)
+	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(BouwstenenRepositoryStub)
+	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 ]]></Implementation>
 </Method>
 
-<Method name="Test: MessageId wordt ingevuld">
+<Method name="Test: RequestConverter vult ErrorText in indien geen bouwstenen gevonden worden">
 <Implementation><![CDATA[
+	#dim BouwstenenRepositoryStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New()
+	Do BouwstenenRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde).DanReturn($$$False)
+	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(BouwstenenRepositoryStub)
+	
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
+	
+	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
+]]></Implementation>
+</Method>
+
+<Method name="Test: MessageId wordt altijd ingevuld">
+<Implementation><![CDATA[
+	#dim BouwstenenRepositoryStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New()
+	Do BouwstenenRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde)
+	
 	#dim RandomMessageId As %String = "RandomMessageId"
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(BouwstenenRepositoryStub)
+	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest, RandomMessageId)
 	
 	Do $$$AssertEquals(ConfigVariant.MessageId, RandomMessageId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Converter geeft velden ItemId, ConfigId en SalesId onbewerkt terug">
+<Method name="Test: Converter neemt velden ItemId, ConfigId en SalesId altijd over van Request">
 <Implementation><![CDATA[
+	#dim BouwstenenRepositoryStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New()
+	Do BouwstenenRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde)
+	
 	#dim RandomItemId As %String = "RandomItemId"
 	#dim RandomConfigId As %String = "RandomConfigId"
 	#dim RandomSalesId As %String = "RandomSalesId"	
@@ -46,6 +86,8 @@
 	Set DummyRequest.ConfigId = RandomConfigId
 	Set DummyRequest.SalesId = RandomSalesId
 	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(BouwstenenRepositoryStub)
+	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
 
 	Do $$$AssertEquals(ConfigVariant.ItemId, RandomItemId)
Index: WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 43041)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.BouwstenenRepository">
+<Super>TECH.Mockable</Super>
+
+<Method name="GeefViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<Implementation><![CDATA[	Quit "GeefViaID(" _ ID _ ")" //^PRBS("BS", ID)
+]]></Implementation>
+</Method>
+
+<Method name="BestaatViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $Data(^PRBS("BS", ID))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/Verwerker.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/Verwerker.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/Verwerker.cls.xml	(revision 43041)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>ErrorText:WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText</FormalSpec>
+<Implementation><![CDATA[
+	If ErrorText = "NotFound" {
+		Do ..VerwerkNotFound()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(ErrorText,"WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkNotFound">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText.cls.xml	(revision 43041)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText">
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>;NotFound</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>;NotFound</Default>
+</Parameter>
+
+<Method name="NotFound">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText</ReturnType>
+<Implementation><![CDATA[	Quit "NotFound"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r43036 -r43041
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43036)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43041)
@@ -3,17 +3,41 @@
 <Class name="WSimpl.AX.CalculatedProduct.RequestConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="BouwstenenRepository">
+<Type>WSimpl.AX.CalculatedProduct.BouwstenenRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BouwstenenRepository:WSimpl.AX.CalculatedProduct.BouwstenenRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..BouwstenenRepository = $$$Inject(BouwstenenRepository, ##class(WSimpl.AX.CalculatedProduct.BouwstenenRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
 <Implementation><![CDATA[
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant).%New()
 
 	Set ConfigVariant.MessageId = MessageId
-	
-	Set ConfigVariant.ConfigId = Request.ConfigId
+		
 	Set ConfigVariant.ItemId = Request.ItemId
+	Set ConfigVariant.ConfigId = Request.ConfigId
 	Set ConfigVariant.SalesId = Request.SalesId
+
+	If (..BouwstenenRepository.BestaatViaID(Request.ItemId)) {
+
+	} Else {
+		Set ConfigVariant.ErrorText = ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound()	
+	}
 	
 	Quit ConfigVariant
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/AutoComplete.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/AutoComplete.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/Converter/enu/ErrorText/AutoComplete.cls.xml	(revision 43041)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="NotFound">
+<Type>%String</Type>
+<InitialExpression>"NotFound"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>