Index: vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml
===================================================================
diff -u -r52415 -r52416
--- vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52415)
+++ vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52416)
@@ -9,6 +9,7 @@
 	#dim BeginDatum As %Date = $H-10
 	#dim EindDatum As %Date = $H
 	#dim GegenereerdAntwoord As APPS.TRANSP.dto.NacalculatieLijst
+	#dim Bestandsnaam = "c:\tom.csv"
 	
 	Set GegenereerdAntwoord = ..GenereerAntwoordData(2)
 	Set TransportdataVoorKlantBepalerMock = ##class(vhTest.Mock.APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler).%New()
@@ -25,13 +26,17 @@
 	Do MailApi.VerwachtMethodCall("MaakNieuwMail").DanReturn(##class(TECH.Mail.impl.Mail).%New())
 	Do MailApi.IndienMethodCall("VerstuurMail",$$$ElkeWaarde).DanDoeNiks()
 	
-	Set Nacalculator = ##class(APPS.TRANSP.impl.TransportService.Nacalculator).%New(TransportdataVoorKlantBepalerMock,RapportGeneratorMock,RapportDataFactoryMock,MailApi)
+	Set FileUtilsMock = ##class(vhTest.Mock.TECH.File.impl.FileUtils).%New()
+	Do FileUtilsMock.VerwachtMethodCall("Delete",Bestandsnaam)
+	
+	Set Nacalculator = ##class(APPS.TRANSP.impl.TransportService.Nacalculator).%New(TransportdataVoorKlantBepalerMock,RapportGeneratorMock,RapportDataFactoryMock,MailApi,FileUtilsMock)
 	Do Nacalculator.DoeNacalculatie(KlantId,BeginDatum,EindDatum)
 	
 	Do TransportdataVoorKlantBepalerMock.Verifieer()
 	Do RapportGeneratorMock.Verifieer()
 	Do RapportDataFactoryMock.Verifieer()
 	Do MailApi.Verifieer()
+	Do FileUtilsMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml
===================================================================
diff -u -r52415 -r52416
--- APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml	(.../Nacalculator.cls.xml)	(revision 52415)
+++ APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml	(.../Nacalculator.cls.xml)	(revision 52416)
@@ -23,8 +23,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FileUtils">
+<Type>TECH.File.FileUtils</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory="",MailApi:TECH.Mail.MailAPI=""</FormalSpec>
+<FormalSpec>TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory="",MailApi:TECH.Mail.MailAPI="",FileUtils:TECH.File.FileUtils=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -34,36 +39,38 @@
 	Set ..RapportGenerator = $$$Inject(RapportGenerator, ##class(APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased).%New())
 	Set ..RapportDataFactory = $$$Inject(RapportDataFactory, ##class(APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory).%New())
 	Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Mail.impl.MailAPI).%New())
+	Set ..FileUtils = $$$Inject(FileUtils, ##class(TECH.File.impl.FileUtils).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="DoeNacalculatie">
 <FormalSpec>KlantId:DOM.common.PartijID,BeginDatum:%Date,EindDatum:%Date</FormalSpec>
 <Implementation><![CDATA[
-
 	#dim Bestandsnaam = "c:\tom.csv"
-	
-	//Data ophalen
-	#dim RitDataLijst = ##class(APPS.TRANSP.dto.NacalculatieLijst).%New()
-	Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
-	
-	//csv maken
-	Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst, Bestandsnaam))
-	
-	//mailen
-	#dim Mail As TECH.Mail.Mail = ..MailApi.MaakNieuwMail()
-	Do Mail.ZetVerzender($$$SystemMail("OV"))
-	Do Mail.ZetOnderwerp("Nacalculatie transporten "_KlantId)
-	Do Mail.ZetInhoud("zie attachment - begindatum = '"_BeginDatum_"' en einddatum = '"_EindDatum_"'")
-	Do Mail.ZetIsHTML($$$True)
-	Do Mail.VoegToeBijlage(Bestandsnaam)
-	Do Mail.VoegToeOntvanger("tve@vanhoecke.be")
-	Do ..MailApi.VerstuurMail(Mail)
-
-	
-	
+		
+	try {
+		//Data ophalen
+		#dim RitDataLijst = ##class(APPS.TRANSP.dto.NacalculatieLijst).%New()
+		Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
+		
+		//csv maken
+		Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst, Bestandsnaam))
+		
+		//mailen
+		#dim Mail As TECH.Mail.Mail = ..MailApi.MaakNieuwMail()
+		Do Mail.ZetVerzender($$$SystemMail("OV"))
+		Do Mail.ZetOnderwerp("Nacalculatie transporten "_KlantId)
+		Do Mail.ZetInhoud("zie attachment - begindatum = '"_BeginDatum_"' en einddatum = '"_EindDatum_"'")
+		Do Mail.ZetIsHTML($$$True)
+		Do Mail.VoegToeBijlage(Bestandsnaam)
+		Do Mail.VoegToeOntvanger("tve@vanhoecke.be")
+		Do ..MailApi.VerstuurMail(Mail)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+	}
 	//csv verwijderen
+	Do ..FileUtils.Delete(Bestandsnaam)
 ]]></Implementation>
 </Method>
 </Class>