Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r2990 -r3490
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 2990)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 3490)
@@ -135,11 +135,16 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim HeeftMockKlasseNodig As %Boolean = $$$False
-	set HeeftMockKlasseNodig = 	(ClassDefinition.Abstract) && ( ..DerivesFromCorrectInterface(ClassDefinition.Name)) && 		 					
-							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"TECH.Template") ) ) && 
-		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"%Library.Base") ) )
-	set:$$$Not(HeeftMockKlasseNodig) HeeftMockKlasseNodig = ClassDefinition.Super [ "TECH.Mockable"		 					
-	quit HeeftMockKlasseNodig
+	
+	If (ClassDefinition.Abstract) {
+		Set HeeftMockKlasseNodig = (..DerivesFromCorrectInterface(ClassDefinition.Name))
+		Set HeeftMockKlasseNodig = HeeftMockKlasseNodig && $$$Not(##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name, "TECH.Template"))
+		Set HeeftMockKlasseNodig = HeeftMockKlasseNodig && $$$Not(##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name, "%Library.Base"))
+	} 	
+					
+	Set:$$$Not(HeeftMockKlasseNodig) HeeftMockKlasseNodig = ClassDefinition.Super [ "TECH.Mockable"
+		 					
+	Quit HeeftMockKlasseNodig
 ]]></Implementation>
 </Method>