Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r3039 -r3256
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 3039)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 3256)
@@ -106,24 +106,34 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>qualifiers:%String,Substrings...:%CacheString</FormalSpec>
 <Implementation><![CDATA[
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
-	Do ##class(vhLib.OldSchool).InitVars()
+	Try {
+		Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
+		Do ##class(vhLib.OldSchool).InitVars()
 	
-	Set manager = ..%New()
-	if $IsObject(Substrings(1)) {
-		do manager.SetTestSuite("Test "_Substrings(1).Count())
-		set itSubstring = ##class(TECH.ListIterator).%New(Substrings(1))
-	} else {
-		set itSubstring = ##class(TECH.ArrayOneDimIterator).%New(.Substrings)
-		do manager.SetTestSuite("Test "_Substrings)
+		Set manager = ..%New()
+		if $IsObject(Substrings(1)) {
+			do manager.SetTestSuite("Test "_Substrings(1).Count())
+			set itSubstring = ##class(TECH.ListIterator).%New(Substrings(1))
+		} else {
+			set itSubstring = ##class(TECH.ArrayOneDimIterator).%New(.Substrings)
+			do manager.SetTestSuite("Test "_Substrings)
+		}
+		while itSubstring.HasNext() {
+			#dim Substring As %String = itSubstring.Next()
+			write !,Substring_".cls() -- do ##class("_manager.%ClassName(1)_").RunTest("""","""_Substring_""")"
+			do manager.RunSuite(qualifiers,,Substring)
+		}
+	 	do manager.DumpFails()
+	 	do manager.MailResult()
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
+		Try {
+			do manager.DumpFails()
+		} Catch {}
+		
+		Write !, !, " ===== TEST MANAGER FAILED =====  ", !, Exception.ToString(), !
 	}
-	while itSubstring.HasNext() {
-		#dim Substring As %String = itSubstring.Next()
-		write !,Substring_".cls() -- do ##class("_manager.%ClassName(1)_").RunTest("""","""_Substring_""")"
-		do manager.RunSuite(qualifiers,,Substring)
-	}
- 	do manager.DumpFails()
- 	do manager.MailResult()
 
 	quit
 ]]></Implementation>
@@ -135,13 +145,23 @@
 <FormalSpec>qualifiers:%String,userparam:%String="",Substring:%String="",methodPrefix:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
- 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
- 	Do ##class(vhLib.OldSchool).InitVars()
- 	Set manager=..%New()
- 	do manager.SetTestSuite(Substring)
- 	do manager.RunSuite(qualifiers,userparam,Substring,methodPrefix)
- 	do manager.DumpFails()
- 	do manager.MailResult()
+	Try {
+	 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
+	 	Do ##class(vhLib.OldSchool).InitVars()
+	 	Set manager=..%New()
+	 	do manager.SetTestSuite(Substring)
+	 	do manager.RunSuite(qualifiers,userparam,Substring,methodPrefix)
+	 	do manager.DumpFails()
+	 	do manager.MailResult()
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
+		Try {
+			do manager.DumpFails()
+		} Catch {}
+		
+		Write !, !, " ===== TEST MANAGER FAILED =====  ", !, Exception.ToString(), !
+	}
  	
  	quit
 ]]></Implementation>
@@ -282,20 +302,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="CollectTestNamesToRun">
-<Private>1</Private>
-<ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[
-	set List = ##class(TECH.ListOfDataTypesOnDisk).%New()
-	set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
- 	do classQuery.Execute(..#PackagePrefix_".TestCase")
- 	while (classQuery.Next() ) {
-		do List.Insert(classQuery.Data("Name"))
- 	}
- 	quit List
-]]></Implementation>
-</Method>
-
 <Property name="StoryPattern">
 <Type>%String</Type>
 <InitialExpression>"2.3A3.4N"</InitialExpression>