Index: Tools/Mock/MockClassBase.cls.xml
===================================================================
diff -u -r1300 -r1302
--- Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1300)
+++ Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1302)
@@ -14,6 +14,12 @@
 <Private>1</Private>
 </Property>
 
+<Property name="IsMethodCallVerwacht">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Method name="IndienMethodCall">
 <Description>
 Aan te roepen door de unit test, om een method te stubben.</Description>
@@ -36,7 +42,10 @@
 <ReturnType>Tools.Mock.MethodCallStub</ReturnType>
 <Implementation><![CDATA[
 	#dim MethodCallStub As Tools.Mock.MethodCallStub = ..IndienMethodCall( MethodNaam, VerwachteParameterWaarden...)
-	Do MethodCallStub.ZetIsVerwacht( $$$true )
+	
+	do MethodCallStub.ZetIsVerwacht( $$$true )
+	set ..IsMethodCallVerwacht = $$$true
+	
 	Quit MethodCallStub
 ]]></Implementation>
 </Method>
@@ -82,9 +91,15 @@
 
 <Method name="Verifieer">
 <Implementation><![CDATA[
+	if $$$Not( ..IsMethodCallVerwacht )  {
+		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Verifieer terwijl er niks verwacht is.")
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+
+	Set Verifieerder = ##class(Tools.Mock.MethodCallStubVerifieerder).%New()
 	Set MethodCallStubsIterator = ##class(TECH.ListIterator).%New( ..MethodCallStubs )
+	
 	While MethodCallStubsIterator.HasNext() {
-		Set Verifieerder = ##class(Tools.Mock.MethodCallStubVerifieerder).%New()
 		Do Verifieerder.Verifieer(MethodCallStubsIterator.Next())
 	}
 ]]></Implementation>