Index: Tools/Mock/MockClassBase.cls.xml
===================================================================
diff -u -r1302 -r1426
--- Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1302)
+++ Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1426)
@@ -92,6 +92,7 @@
 <Method name="Verifieer">
 <Implementation><![CDATA[
 	if $$$Not( ..IsMethodCallVerwacht )  {
+		Set ..IsMethodCallVerwacht = $$$False
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Verifieer terwijl er niks verwacht is.")
 		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
@@ -104,6 +105,20 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	If ..IsMethodCallVerwacht = $$$True {
+		Set Exceptie = ##class(TECH.Exceptions.IllegalUsageException).%New("Verwacht methodcall gebruikt zonder verificatie, '"_..%ClassName($$$True)_"'")
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>