Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r1902 -r1905
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1902)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1905)
@@ -91,7 +91,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	if $isObject(Value) {
-		set result = $zobjMethod(Value,"%ValidateObject")
+		set result = ( $zobjMethod(Value,"%ValidateObject") = 1 )
 		if result { set result = $zobjMethod(Value,"%Extends",ClassName) }
 		if result { set result = ..PropertiesValid(Value) }
 	}
@@ -108,34 +108,33 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#define CalculatedPropertiesNotIncluded 0
+	
+	if '$IsObject(Object) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Opgegeven object is geen object"))
+	}
+	set CompiledClass = ##class(%Dictionary.CompiledClass).%OpenId(Object.%ClassName(1))
+	if '$isObject(CompiledClass) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen gecompileerde code beschikbaar voor "_Object.%ClassName(1)))
+	}
 	set result = 1
-	set itProperties = ##class(TECH.ListIterator).%New(..GetProperties(Object.%ClassName(1),$$$CalculatedPropertiesNotIncluded))
-	while result , itProperties.HasNext() {
+	set itProperties = ##class(TECH.ListIterator).%New(CompiledClass.Properties)
+	while itProperties.HasNext() {
 		set Property = itProperties.Next()
-		set PropertyValue = $zobjProperty(Object,Property)
-		if $length(PropertyValue) set result = $zobjMethod(Object,Property_"IsValidDT",PropertyValue)
+		continue:Property.Calculated
+		set PropertyValue = $zobjProperty(Object,Property.Name)
+		if Property.Collection {
+			set itCollection = ##class(TECH.ListIterator).%New(PropertyValue)
+			while (result) && (itCollection.HasNext()) {
+				set CollectionValue = itCollection.Next()
+				set result = ..ValueIsValid(CollectionValue,Property.Type)
+			}
+		}
+		elseif $length(PropertyValue) {
+			set result = $zobjMethod(Object,Property.Name_"IsValidDT",PropertyValue)
+		}
 	}
 	quit result
 ]]></Implementation>
 </Method>
-
-<Method name="GetProperties">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ClassName:%String,IncludeCalculated:%Boolean=1</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[
-	set listProperties = ##class(%ListOfDataTypes).%New()
-	set CompiledClass = ##class(%Dictionary.CompiledClass).%OpenId(ClassName)
-	if $isObject(CompiledClass) {
-		set itProperties = ##class(TECH.ListIterator).%New(CompiledClass.Properties)
-		while itProperties.HasNext() {
-			set Property = itProperties.Next()
-			continue:('IncludeCalculated)&&(Property.Calculated)
-			do listProperties.Insert(Property.Name)
-		}
-	}
-	Quit listProperties
-]]></Implementation>
-</Method>
 </Class>
 </Export>
Index: vhUnitTest/TECH/ClassUtilsTestObject.cls.xml
===================================================================
diff -u -r1901 -r1905
--- vhUnitTest/TECH/ClassUtilsTestObject.cls.xml	(.../ClassUtilsTestObject.cls.xml)	(revision 1901)
+++ vhUnitTest/TECH/ClassUtilsTestObject.cls.xml	(.../ClassUtilsTestObject.cls.xml)	(revision 1905)
@@ -16,7 +16,7 @@
 </Property>
 
 <Property name="Array">
-<Type>%String</Type>
+<Type>TECH.Integer</Type>
 <Collection>array</Collection>
 </Property>
 
Index: vhUnitTest/TECH/ClassUtils.cls.xml
===================================================================
diff -u -r1901 -r1905
--- vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1901)
+++ vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1905)
@@ -74,6 +74,19 @@
 	set obj.ValueList="ValidValue"
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 4")
 
+	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
+	set obj.Required="required"
+	set obj.ValueList="ValidValue"
+	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
+	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 5")
+
+	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
+	set obj.Required="required"
+	set obj.ValueList="ValidValue"
+	do obj.Array.SetAt(15.5,"OnGeldigeIntegerWaarde")
+	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
+	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 6")
+
 	quit
 ]]></Implementation>
 </Method>