diff --git a/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/Models/Simulation/Impl/VectoRun.cs
index b31a9374a8d384eac7c6aecef395c89ea37f17b2..d3d3d3900b87dbabc44e5237936893606e166d70 100644
--- a/VectoCore/Models/Simulation/Impl/VectoRun.cs
+++ b/VectoCore/Models/Simulation/Impl/VectoRun.cs
@@ -18,7 +18,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 		protected string JobFileName { get; set; }
 		protected string JobName { get; set; }
 		protected ISimulationOutPort CyclePort { get; set; }
-		protected IModalDataWriter DataWriter { get; set; }
+		//protected IModalDataWriter DataWriter { get; set; }
 		protected IVehicleContainer Container { get; set; }
 
 		protected VectoRun(IVehicleContainer container)
@@ -49,13 +49,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 					}
 				} while (response is ResponseSuccess);
 			} catch (VectoSimulationException vse) {
-				if (DataWriter != null) {
-					DataWriter.Finish();
-				}
+				Container.FinishSimulation();
 				throw new VectoSimulationException("absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}", vse, AbsTime,
 					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, vse.Message);
 			} catch (VectoException ve) {
-				DataWriter.Finish();
+				Container.FinishSimulation();
 				throw new VectoSimulationException("absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}", ve, AbsTime,
 					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, ve.Message);
 			}