diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs
index f28629011d48993f5283814d60f2e7e756fbc751..735cecee61430d7e451f3d24cf8cf1e23f72b157 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs
@@ -23,8 +23,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 
 		public GearboxType Type
 		{
-			get
-			{
+			get {
 				var value = GetElementValue(XMLNames.Gearbox_TransmissionType);
 				switch (value) {
 					case "MT":
@@ -36,14 +35,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 					case "AT - PowerSplit":
 						return GearboxType.ATPowerSplit;
 				}
-				throw new ArgumentOutOfRangeException(value);
+				throw new ArgumentOutOfRangeException("GearboxType", value);
 			}
 		}
 
 		public IList<ITransmissionInputData> Gears
 		{
-			get
-			{
+			get {
 				var retVal = new List<ITransmissionInputData>();
 				var gears = Navigator.Select(
 					Helper.Query(XBasePath, XMLNames.Gearbox_Gears, XMLNames.Gearbox_Gears_Gear),
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
index 35ee3528fdf02d398bda92a16cf926b9e60f15a1..e1b4ab941251940b39be049e290bb5d788e63063 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
@@ -48,8 +48,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 
 		public IList<IAxleDeclarationInputData> Axles
 		{
-			get
-			{
+			get {
 				var axles = Navigator.Select(Helper.Query(VehiclePath, XMLNames.Vehicle_Components, XMLNames.Component_AxleWheels,
 					XMLNames.ComponentDataWrapper, XMLNames.AxleWheels_Axles, XMLNames.AxleWheels_Axles_Axle), Manager);
 
@@ -85,8 +84,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 
 		public RetarderType RetarderType
 		{
-			get
-			{
+			get {
 				var value = GetElementValue(XMLNames.Vehicle_RetarderType); //.ParseEnum<RetarderType>(); 
 				switch (value) {
 					case "None":
@@ -100,7 +98,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 					case "Transmission Output Retarder":
 						return RetarderType.TransmissionOutputRetarder;
 				}
-				throw new ArgumentOutOfRangeException(value);
+				throw new ArgumentOutOfRangeException("RetarderType", value);
 			}
 		}
 
diff --git a/VectoCore/VectoCore/OutputData/XML/AbstractXMLWriter.cs b/VectoCore/VectoCore/OutputData/XML/AbstractXMLWriter.cs
index de3be434e84517813db6a905308bd7d13fa1991e..efd437645e108a05e2b0c316521bcadeffb6af96 100644
--- a/VectoCore/VectoCore/OutputData/XML/AbstractXMLWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/AbstractXMLWriter.cs
@@ -81,7 +81,7 @@ namespace TUGraz.IVT.VectoXML.Writer
 				case CrossWindCorrectionMode.DeclarationModeCorrection:
 					return "Declaration Mode Correction";
 				default:
-					throw new ArgumentOutOfRangeException("mode", mode, null);
+					throw new ArgumentOutOfRangeException("CrosswindCorrection", mode, null);
 			}
 		}
 
@@ -99,7 +99,7 @@ namespace TUGraz.IVT.VectoXML.Writer
 				case RetarderType.LossesIncludedInTransmission:
 					return "Losses included in Gearbox";
 				default:
-					throw new ArgumentOutOfRangeException("retarder", type, null);
+					throw new ArgumentOutOfRangeException("RetarderType", type, null);
 			}
 		}