Index: TECH/Mail/impl/BestandVerzender.cls.xml
===================================================================
diff -u -r861 -r876
--- TECH/Mail/impl/BestandVerzender.cls.xml	(.../BestandVerzender.cls.xml)	(revision 861)
+++ TECH/Mail/impl/BestandVerzender.cls.xml	(.../BestandVerzender.cls.xml)	(revision 876)
@@ -52,19 +52,25 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(Mail.GeefOnderwerp())
- 	set File = ##class(TECH.File.FileWriter).%New(BestandVolledigeNaam)
- 	Do File.WriteLine("Onderwerp: '"_Mail.GeefOnderwerp()_"'")
- 	Do File.WriteLine("Verzender '"_Mail.GeefVerzender()_"'")
- 	Do File.WriteLine("Ontvangers: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangers(),",")_"'")
- 	Do File.WriteLine("Ontvangers CC: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersCC(),",")_"'")
- 	Do File.WriteLine("Ontvangers BCC: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersBCC(),",")_"'")
- 	Do File.WriteLine("OrigineleOntvangersInfo: ")
- 	Do File.WriteLine(Mail.GeefOrigineleOntvangersInfo())
- 	Do File.WriteLine("----INHOUD------------------------------------------------")
- 	Do File.WriteStream(Mail.GeefVolledigeInhoudAlsStream())
- 	Do File.WriteLine()
- 	Do File.WriteLine("----EINDE INHOUD------------------------------------------")
-	do File.Close()
+
+	set File = ##class(TECH.File.FileWriter).%New(BestandVolledigeNaam)
+
+ 	do File.WriteLine("Onderwerp: "_Mail.GeefOnderwerp())
+ 	do File.WriteLine("Verzender: "_Mail.GeefVerzender())
+
+ 	if (Mail.GeefOntvangers().Size) {
+	 	do File.WriteLine("Ontvangers: "_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangers(),","))
+ 	}
+ 	if Mail.GeefOntvangersCC().Size {
+	 	do File.WriteLine("Ontvangers CC: "_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersCC(),","))
+ 	}
+ 	if Mail.GeefOntvangersBCC().Size { 
+ 		do File.WriteLine("Ontvangers BCC: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersBCC(),","))
+ 	}
+ 	
+ 	do File.WriteLine("Data:")
+ 	do File.WriteStream(Mail.GeefVolledigeInhoudAlsStream())
+ 	do File.Close()
 ]]></Implementation>
 </Method>
 
@@ -74,7 +80,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandVolledigeNaam As %String = ..BestandLocatie
-	Set BestandVolledigeNaam = ##class(TECH.Files).AppendFile(BestandVolledigeNaam,..VerzondenMails.Count()_"_"_Onderwerp_".txt")
+	Set BestandVolledigeNaam = ##class(TECH.Files).AppendFile(BestandVolledigeNaam,"Mail_"_##class(TECH.StringUtils).AlignRight(..VerzondenMails.Count(),0,3)_".txt")
 	Quit BestandVolledigeNaam
 ]]></Implementation>
 </Method>
Index: vhLib/Class.mac.rou
===================================================================
diff -u -r875 -r876
--- vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 875)
+++ vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 876)
@@ -72,9 +72,9 @@
             	set PropertyName = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"")_PropertyName
             	if flagCanSave set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName) 
         	}else { 
-	           set:flagDeeperLevel'="F" flagDeeperLevel = ( $$IsEmbedded(PropertyType) && ('ClassName=PropertyType ) && ( '$length($$Collection(ClassName,PropertyName))))
+	           set:flagDeeperLevel'="F" flagDeeperLevel = ( $$IsEmbedded(PropertyType) && ( '$length($$Collection(ClassName,PropertyName))))
 	           if 'flagDeeperLevel set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName)
-    	       if ( (flagDeeperLevel ) || ( flagDeeperLevel = "F" ) ) ,'$$IsSwizzled(ClassName,PropertyName) { 
+    	       if ( (flagDeeperLevel ) || ( flagDeeperLevel = "F" ) ) , '$$IsSwizzled(ClassName,PropertyName)  , (ClassName'=PropertyType){ 
 	           	 	set arrHULP($job,"ClassName") = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"") _ PropertyName
              		do BuildarrProperties(PropertyType,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel) 
              	}
Index: TECH/FrequentieTabel.cls.xml
===================================================================
diff -u -r858 -r876
--- TECH/FrequentieTabel.cls.xml	(.../FrequentieTabel.cls.xml)	(revision 858)
+++ TECH/FrequentieTabel.cls.xml	(.../FrequentieTabel.cls.xml)	(revision 876)
@@ -28,6 +28,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ResetItems">
+<Implementation><![CDATA[
+	set ItemsIterator = ##class(TECH.ListIterator).%New(..Items)
+	while ItemsIterator.HasNext() {
+		do ItemsIterator.Next()
+		#dim Item As %String = ItemsIterator.Key()
+		do ..Reset(Item)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Verhoog">
 <FormalSpec>Item:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..VerhoogMetAantal(Item, 1)
@@ -45,8 +56,7 @@
 <ReturnType>%Double</ReturnType>
 <Implementation><![CDATA[
 	#dim Frequentie As %Double = 0
-	If (..Items.IsDefined(Item))
-	{
+	If (..Items.IsDefined(Item)) {
 		Set Frequentie = ..Items.GetAt(Item)
 	}
 	Quit Frequentie
Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r717 -r876
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 717)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 876)
@@ -31,6 +31,11 @@
 			Set MaakEventCode = MaakEventCode _$C(13,10)_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
 
 			Do Logger.ErrorMail(Exception.GeefOmschrijving(),"Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject)_$C(13,10,13,10)_"Reinvoke:"_$C(13,10)_MaakEventCode_$C(13,10,13,10)_"Error: "_$C(13,10)_Exception.ToString())
+			
+			
+			if ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("TECH.PubSub.Rethrow_Event") {
+				do ##class(TECH.ExceptionHandler).Throw(Exception)
+			}
 		}
 	}