diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 8c4aa69cf90b0ef62603b1af582e3fb74c7c55e1..366ce7103a0b70c96d59e80b4406d6cdde98208a 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -11,7 +11,7 @@
 * by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use VECTO except in compliance with the Licence.
 * You may obtain a copy of the Licence at:
-*
+*	
 * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
 *
 * Unless required by applicable law or agreed to in writing, VECTO
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index bcfcba8473084fc2d22c24067bed86168bfb09ec..e72359ae8f789906e243a61bd99651d6787324af 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -147,7 +147,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 							continue;
 						}
 
-
 						for (var inTorque = engineData.FullLoadCurve.FullLoadStationaryTorque(angularVelocity) / 3;
 							inTorque < engineData.FullLoadCurve.FullLoadStationaryTorque(angularVelocity);
 							inTorque += 2.0 / 3.0 * engineData.FullLoadCurve.FullLoadStationaryTorque(angularVelocity) / 10.0) {
@@ -183,8 +182,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 									return
 										new ValidationResult(
 											string.Format(
-										"Interpolation of AxleGear-LossMap failed with torque={0} and angularSpeed={1} (gear={2}, velocity={3})",
-										axlegearTorque, axleAngularVelocity.ConvertTo().Rounds.Per.Minute, gear.Key, velocity));
+												"Interpolation of AxleGear-LossMap failed with torque={0} and angularSpeed={1} (gear={2}, velocity={3})",
+												axlegearTorque, axleAngularVelocity.ConvertTo().Rounds.Per.Minute, gear.Key, velocity));
 								}
 							}
 						}
@@ -192,7 +191,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 				}
 			}
 
-			if (runData.Cycle.Entries.Any(e => e.PTOActive)) {
+			if (runData.Cycle != null && runData.Cycle.Entries.Any(e => e.PTOActive)) {
 				if (runData.PTO == null || runData.PTO.PTOCycle == null)
 					return new ValidationResult("PTOCycle is used in DrivingCycle, but is not defined in Vehicle-Data.");
 			}
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index 84a47a4d77af53fe30c94614e8c588c09a9cac38..0e5b17ff5e7225e775a86f9ad437baa15a682433 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
@@ -92,7 +92,8 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="fullHeader">set true is column names should be preserved. Otherwise units are trimed away. default: false.</param>
 		/// <param name="source"></param>
 		/// <returns>A DataTable which represents the CSV File.</returns>
-		public static TableData ReadStream(Stream stream, bool ignoreEmptyColumns = false, bool fullHeader = false, string source = null)
+		public static TableData ReadStream(Stream stream, bool ignoreEmptyColumns = false, bool fullHeader = false,
+			string source = null)
 		{
 			var retVal = new TableData(source);
 			ReadCSV(retVal, stream, ignoreEmptyColumns, fullHeader);