Index: APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml
===================================================================
diff -u -r38320 -r40672
--- APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 38320)
+++ APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 40672)
@@ -47,12 +47,22 @@
 <Implementation><![CDATA[
 	Do ..Init()
 	Do ..FileWriter.Open(..GeefBestandVolledigeNaam(),$$$False)
-	Do ..SchrijfHoofding()
-	While ..Next() {
-		Do ..SchrijfRegel()
+	Try {
+		Do ..SchrijfHoofding()
+		While ..Next() {
+			Do ..SchrijfRegel()
+		}
+		Do ..Close()
+		Do ..FileWriter.Close()
+	} Catch {
+		#Dim Exception = ##class(TECH.ExceptionHandler).Catch()
+		Try {
+			Do ..FileWriter.Close()
+		} Catch {
+			Do ##class(vhLib.Logger).%New().LogExceptie(##class(TECH.ExceptionHandler).Catch())
+		}
+		Do ##class(TECH.ExceptionHandler).Rethrow( Exception )
 	}
-	Do ..Close()
-	Do ..FileWriter.Close()
 ]]></Implementation>
 </Method>
 
@@ -131,6 +141,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandVolledigeNaam As %String = ..Data.BestandVolledigeNaam
+	W !,BestandVolledigeNaam
 	Quit BestandVolledigeNaam
 ]]></Implementation>
 </Method>