Index: Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml
===================================================================
diff -u -r2026 -r2135
--- Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml	(.../EnumeratieVerwerkerGenerator.cls.xml)	(revision 2026)
+++ Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml	(.../EnumeratieVerwerkerGenerator.cls.xml)	(revision 2135)
@@ -82,7 +82,7 @@
 		Set VoorafgaandAanIf = $$$TAB_"} Else"
 	}
 	Do Methode.Implementation.WriteLine($$$TAB_"} Else {")
-	Do Methode.Implementation.WriteLine($$$TAB_$$$TAB_"Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New("_ParameterVariabeleNaam_","""_KlasseNaam_""")")
+	Do Methode.Implementation.WriteLine($$$TAB_$$$TAB_"Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New("_ParameterVariabeleNaam_","""_KlasseNaam_""",$classname())")
 	Do Methode.Implementation.WriteLine($$$TAB_$$$TAB_"Do ##class(TECH.ExceptionHandler).Throw(Exceptie)")
 	Do Methode.Implementation.WriteLine($$$TAB_"}")
 	do Methode.%Save()