Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r72778 -r72789
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72778)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72789)
@@ -14,13 +14,14 @@
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>EncowayJsonConverter:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter="",EncowayHttpClient:WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
-	Set ..EncowayHttpClient = ##class(WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New()
+	Set ..EncowayJsonConverter = $$$Inject(EncowayJsonConverter, ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New())
+	Set ..EncowayHttpClient = $$$Inject(EncowayHttpClient, ##class(WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -30,9 +31,12 @@
 <FormalSpec>CID:TECH.String</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
 <Implementation><![CDATA[
+	If (CID = "") {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ophalen VHConfig is mislukt aangezien de CID leeg is."))
+	}
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ""
 	
-	#dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID))			
+	#dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID))
 	#dim VhConfigJsonString As %Stream.GlobalBinary = ..EncowayHttpClient.HaalOpVhConfig(GeefMaatwerkDetailsRequestJsonStream)	
 	Set VhConfig = ..EncowayJsonConverter.Parse(VhConfigJsonString)
 
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(revision 72789)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetails.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Standaard gedrag">
+<Implementation><![CDATA[
+	#dim DummyCID As %String = "ABC123"
+	#dim DummyMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = " { ""CID"": """ _ DummyCID _ """} "
+	#dim DummyResponse As %Stream.GlobalBinary = "{""isValid"": ""null"", ""MaatwerkDetails"": { ""Halffabrikaten"": {}, ""Kosten"": [], ""VerwijderdeHalffabItems"": [] }, ""Kenmerken"": {}, ""Model"": null, ""BerekendeKenmerken"": {}, ""CID"": null }"
+	Set DummyVhConfig = ##class(APPS.PM.Maatwerk.dto.VhConfig).%New()
+	Set DummyVhConfig.CID = DummyCID
+	
+	Set EncowayJsonConverterMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	Do EncowayJsonConverterMock.VerwachtMethodCall("Stringify", $$$ElkeWaarde).DanReturn(DummyMaatwerkDetailsRequestJsonStream)
+	Do EncowayJsonConverterMock.VerwachtMethodCall("Parse", DummyResponse).DanReturn(DummyVhConfig)
+	
+	Set EncowayHttpClientMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New()
+	Do EncowayHttpClientMock.VerwachtMethodCall("HaalOpVhConfig", DummyMaatwerkDetailsRequestJsonStream).DanReturn(DummyResponse)
+	
+	Set EncowayService = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway).%New(EncowayJsonConverterMock, EncowayHttpClientMock)
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayService.GeefMaatwerkDetails(DummyCID)
+	
+	Do EncowayJsonConverterMock.Verifieer()
+	Do EncowayHttpClientMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien de CID leeg -&gt; Gooi error">
+<Implementation><![CDATA[
+	#dim DummyCID As %String = ""
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Ophalen VHConfig is mislukt aangezien de CID leeg is.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Set EncowayService = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayService.GeefMaatwerkDetails(DummyCID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>