Index: vhUnitTest/BL/MB/UGLYPicking/Aventosbak.cls.xml
===================================================================
diff -u -r29059 -r40259
--- vhUnitTest/BL/MB/UGLYPicking/Aventosbak.cls.xml	(.../Aventosbak.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/MB/UGLYPicking/Aventosbak.cls.xml	(.../Aventosbak.cls.xml)	(revision 40259)
@@ -50,35 +50,31 @@
 </UDLText>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#Dim Result As %Status = $$$OK
+	Do ##super()
+	
 	Try {
 		Do ..MaakNietAventosSet()
 		Do ..MaakAventosSetZonderVerpakkingDefinities()
 		Do ..MaakComplexeAventosSet2()
 	    Do ..MaakComplexeAventosSet()
 	} Catch {
-		Set ExceptionString = ##class(TECH.ExceptionHandler).Catch().ToString()
-		Set Result = $$$ERROR($$$GeneralError, ExceptionString)
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
-	
- 	Quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#Dim Result As %Status = $$$OK
 	Try {
 		do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData( 1000, 1099 )
 	} Catch {
-		Set ExceptionString = ##class(TECH.ExceptionHandler).Catch().ToString()
-		Set Result = $$$ERROR($$$GeneralError, ExceptionString)
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
- 	Quit Result
+	Do ##super()
 ]]></Implementation>
 </Method>