Index: Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml
===================================================================
diff -u -r1151 -r1270
--- Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml	(.../EnumeratieVerwerkerGenerator.cls.xml)	(revision 1151)
+++ Tools/CodeGen/EnumeratieVerwerkerGenerator.cls.xml	(.../EnumeratieVerwerkerGenerator.cls.xml)	(revision 1270)
@@ -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_")")
+	Do Methode.Implementation.WriteLine($$$TAB_$$$TAB_"Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New("_ParameterVariabeleNaam_","""_KlasseNaam_""")")
 	Do Methode.Implementation.WriteLine($$$TAB_$$$TAB_"Do ##class(TECH.ExceptionHandler).Throw(Exceptie)")
 	Do Methode.Implementation.WriteLine($$$TAB_"}")
 	do Methode.%Save()
Index: TECH/Exceptions/EnumerationException.cls.xml
===================================================================
diff -u -r1115 -r1270
--- TECH/Exceptions/EnumerationException.cls.xml	(.../EnumerationException.cls.xml)	(revision 1115)
+++ TECH/Exceptions/EnumerationException.cls.xml	(.../EnumerationException.cls.xml)	(revision 1270)
@@ -5,6 +5,11 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.Exceptions.AbstractOmschrijvingException</Super>
 
+<Property name="EnumeratieKlasse">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="GeefExceptionCode">
 <ReturnType>TECH.enu.ExceptionCode</ReturnType>
 <Implementation><![CDATA[	Quit ##class(TECH.enu.ExceptionCode).GeneralError()
@@ -13,9 +18,22 @@
 
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "Enumeratie " _ ..Omschrijving _ " bestaat niet in de verwerker"
+<Implementation><![CDATA[	Quit "Enumeratie '" _ ..Omschrijving _ "' van '"_..EnumeratieKlasse_"' bestaat niet in de verwerker"_$$GetStackToString^vhLib()
 ]]></Implementation>
 </Method>
+
+<Method name="%OnNew">
+<FormalSpec>Omschrijving:%String,EnumeratieKlasse:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ^zJBL = $$GetStackToString^vhLib()
+	Do ##super(Omschrijving)
+	Set ..EnumeratieKlasse = EnumeratieKlasse
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>