Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r2207 -r2217
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2207)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2217)
@@ -40,7 +40,7 @@
 				/// Deep validate 
 				Set HeeftDefaultArg = ($length(DefaultArg)>0)
 				If ('HeeftDefaultArg || (HeeftDefaultArg && HeeftParameterInhoud)){
-					Do ##class(TECH.ClassUtils).ValueIsValid(@ParameterName,Parameter.GeefType())
+					Do ##class(TECH.ClassUtils).ValidateValue(@ParameterName,Parameter.GeefType())
 				}
 				Set CurrentParameter = CurrentParameter + 1
 			}			
@@ -109,7 +109,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsValidParameterForMethod">
+<Method name="ValidateParameterForMethod">
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String,Parameter:%String]]></FormalSpec>
 <Implementation><![CDATA[
@@ -122,12 +122,25 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
 <Implementation><![CDATA[
+	Set $ZTRAP = "CatchIsNotValidReturnType"
+	Do ..ValidateReturnTypeForMethod(.Value,ClassName,Method)
+	Quit $$$OK
+CatchIsNotValidReturnType
+	Set $ZTRAP = ""
+	Quit 0
+]]></Implementation>
+</Method>
+
+<Method name="ValidateReturnTypeForMethod">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
+<Implementation><![CDATA[
 	set Type = ..GetMethodReturnType(ClassName,Method)
-	Do ..ValueIsValid(.Value,Type)
+	Do ..ValidateValue(.Value,Type)
 ]]></Implementation>
 </Method>
 
-<Method name="ValueIsValid">
+<Method name="ValidateValue">
 <Description>
 Throwt foutmelding indien niet geldig. </Description>
 <ClassMethod>1</ClassMethod>
@@ -155,10 +168,24 @@
 		Set:(($G(%objlasterror)'="") && '(%objlasterror [ "ECODETRAP")) Message = Message_" "_$$ParseStatus^vhLib(%objlasterror)
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(Message))	
 	}
-	quit
 ]]></Implementation>
 </Method>
 
+<Method name="ValueIsValid">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String]]></FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set $ZTRAP = "CatchValueNotValid"
+	Do ..ValidateValue(.Value,ClassName)
+	Quit $$$OK	
+CatchValueNotValid
+	Set $ZTRAP = ""
+	
+	Quit 0
+]]></Implementation>
+</Method>
+
 <Method name="PropertiesValid">
 <Description>
 Throwt foutmelding indien niet geldig. </Description>