Index: vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml
===================================================================
diff -u -r57264 -r57309
--- vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57264)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57309)
@@ -7,22 +7,22 @@
 <Type>DOM.PM.ProductTypeAPI</Type>
 </Property>
 
-<Method name="Test: Bepaal geeft leeg terug">
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
+	Do ##super(aTestName)
 	
-	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Set ..ProductTypeApi  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal throwt een exceptie indien LadeVariant niet bepaald kan worden">
+<Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LadeVariant kan niet bepaald worden volgens ProductId '' en LadeVariantVolgensAxKenmerken ''.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", Substrings))
 	
-	Set ..ProductTypeApi = ProductTypeApiStub
-	
 	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, ##class(%ListOfObjects).%New())
-	
-	Do $$$AssertEquals(LadeVariant, "")
-	Do ProductTypeApiStub.Verifieer()
+	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal("", ##class(%ListOfObjects).%New())
 ]]></Implementation>
 </Method>
 
Index: WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml
===================================================================
diff -u -r57265 -r57309
--- WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57265)
+++ WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57309)
@@ -3,6 +3,11 @@
 <Class name="WSimpl.AX.CalculatedProduct.LadeVariantBepaler">
 <Super>TECH.Mockable</Super>
 
+<Property name="LadeVariantVolgensAxKenmerken">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ProductTypeApi">
 <Type>DOM.PM.ProductTypeAPI</Type>
 <Private>1</Private>
@@ -25,13 +30,21 @@
 <FormalSpec>ProductId:%String,Kenmerken:%List</FormalSpec>
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = ..BepaalLadeVariantVolgensProductId(ProductId)
+	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = ""
 	
+	If ($$$HasLength(ProductId)) {
+		Set LadeVariant = ..BepaalLadeVariantVolgensProductId(ProductId)
+	}
+	
 	If ($$$Not($$$HasLength(LadeVariant))) {
 		#dim KenmerkenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Kenmerken)
 		Set LadeVariant = ..BepaalLadeVariantVolgensKenmerken(KenmerkenIterator)
 	}
 	
+	If ($$$Not($$$HasLength(LadeVariant))) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("LadeVariant kan niet bepaald worden volgens ProductId '"_ProductId_"' en LadeVariantVolgensAxKenmerken '"_..LadeVariantVolgensAxKenmerken_"'."))
+	}
+	
 	Quit LadeVariant
 ]]></Implementation>
 </Method>
@@ -61,22 +74,21 @@
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[
 	#dim LadeVariant As %String = ""
-	#dim AxLadeVariant As %String = ""
 	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute
 	
 	While (KenmerkenIterator.HasNext()) {
 		Set Kenmerk = KenmerkenIterator.Next()
 		If (Kenmerk.Name = "Data.Kenmerken.Variant") {
-			Set AxLadeVariant = Kenmerk.ValueTxt
+			Set ..LadeVariantVolgensAxKenmerken = Kenmerk.ValueTxt
 			Continue
 		}
 	}
 	
-	If (AxLadeVariant = "TBX") {
+	If (..LadeVariantVolgensAxKenmerken = "TBX") {
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TBX()
-	} ElseIf (AxLadeVariant = "LBX") {
+	} ElseIf (..LadeVariantVolgensAxKenmerken = "LBX") {
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).LBX()
-	} ElseIf (AxLadeVariant = "TAX") {
+	} ElseIf (..LadeVariantVolgensAxKenmerken = "TAX") {
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TAX()
 	}