Index: WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml
===================================================================
diff -u -r57309 -r57322
--- WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57309)
+++ WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57322)
@@ -27,7 +27,7 @@
 </Method>
 
 <Method name="Bepaal">
-<FormalSpec>ProductId:%String,Kenmerken:%List</FormalSpec>
+<FormalSpec>ProductId:%String,Kenmerken:%ListOfObjects</FormalSpec>
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[
 	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = ""
@@ -36,13 +36,13 @@
 		Set LadeVariant = ..BepaalLadeVariantVolgensProductId(ProductId)
 	}
 	
-	If ($$$Not($$$HasLength(LadeVariant))) {
-		#dim KenmerkenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Kenmerken)
-		Set LadeVariant = ..BepaalLadeVariantVolgensKenmerken(KenmerkenIterator)
+	If (LadeVariant = "") {
+		Set LadeVariant = ..BepaalLadeVariantVolgensKenmerken(Kenmerken)
 	}
 	
-	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_"'."))
+	If (LadeVariant = "") {
+		#dim ExceptieOmschrijving As %String = "LadeVariant kan niet bepaald worden volgens ProductId '"_ProductId_"' en LadeVariant '"_..LadeVariantVolgensAxKenmerken_"'."
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(ExceptieOmschrijving))
 	}
 	
 	Quit LadeVariant
@@ -69,18 +69,20 @@
 </Method>
 
 <Method name="BepaalLadeVariantVolgensKenmerken">
-<FormalSpec>KenmerkenIterator:TECH.Iterator</FormalSpec>
+<FormalSpec>Kenmerken:%ListOfObjects</FormalSpec>
 <Private>1</Private>
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[
+	// De property LadeVariantVolgensAxKenmerken is nodig voor de eventuele InvalidInputException in Bepaal()
+	
 	#dim LadeVariant As %String = ""
 	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute
+	#dim KenmerkenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Kenmerken)
 	
-	While (KenmerkenIterator.HasNext()) {
+	While ((KenmerkenIterator.HasNext()) && (..LadeVariantVolgensAxKenmerken = "")) {
 		Set Kenmerk = KenmerkenIterator.Next()
 		If (Kenmerk.Name = "Data.Kenmerken.Variant") {
 			Set ..LadeVariantVolgensAxKenmerken = Kenmerk.ValueTxt
-			Continue
 		}
 	}
 	
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml
===================================================================
diff -u -r57265 -r57322
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57265)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57322)
@@ -16,7 +16,7 @@
 </Method>
 
 <Method name="Bepaal">
-<FormalSpec>ProductId:%String,Kenmerken:%List</FormalSpec>
+<FormalSpec>ProductId:%String,Kenmerken:%ListOfObjects</FormalSpec>
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",ProductId,Kenmerken)
 ]]></Implementation>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml
===================================================================
diff -u -r57309 -r57322
--- vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57309)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57322)
@@ -18,7 +18,7 @@
 
 <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 ''.")
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LadeVariant kan niet bepaald worden volgens ProductId '' en LadeVariant ''.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", Substrings))
 	
 	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml
===================================================================
diff -u -r57265 -r57322
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57265)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57322)
@@ -8,7 +8,7 @@
 <Super>WSimpl.AX.CalculatedProduct.LadeVariantBepaler</Super>
 
 <Method name="Bepaal">
-<FormalSpec>ProductId:%String,Kenmerken:%List</FormalSpec>
+<FormalSpec>ProductId:%String,Kenmerken:%ListOfObjects</FormalSpec>
 <ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>