diff --git a/Generic Vehicles/Declaration Mode/S_HEV/S2_Job/GenericEMotor_125kW_485Nm.vem b/Generic Vehicles/Declaration Mode/S_HEV/S2_Job/GenericEMotor_125kW_485Nm.vem
index a699c9ba5c8eeeabf99f109745982d1b9620124a..61e7a491a2d0d7001ee9287a65f8c1b03204772b 100644
--- a/Generic Vehicles/Declaration Mode/S_HEV/S2_Job/GenericEMotor_125kW_485Nm.vem	
+++ b/Generic Vehicles/Declaration Mode/S_HEV/S2_Job/GenericEMotor_125kW_485Nm.vem	
@@ -16,10 +16,10 @@
     "VoltageLevels": [
       {
         "Voltage": 0.0,
-        "ContinuousTorque": 23873.2414637843,
+        "ContinuousTorque": 350,
         "ContinuousTorqueSpeed": "2000",
-        "OverloadTorque": 0.0,
-        "OverloadTorqueSpeed": 0.0,
+        "OverloadTorque": 480,
+        "OverloadTorqueSpeed": 2000,
         "OverloadTime": 30.0,
         "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp",
         "EfficiencyMap": {
@@ -28,10 +28,10 @@
       },
       {
         "Voltage": 1000000000.0,
-        "ContinuousTorque": 23873.2414637843,
+        "ContinuousTorque": 350,
         "ContinuousTorqueSpeed": "2000",
-        "OverloadTorque": 0.0,
-        "OverloadTorqueSpeed": 0.0,
+        "OverloadTorque": 480,
+        "OverloadTorqueSpeed": 2000,
         "OverloadTime": 30.0,
         "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp",
         "EfficiencyMap": {
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs
index 2a4a13d2d2dbf2c007cfbc714e13397a5352ad14..f8dff7a438ce67daa4b414bd6a43dae5e4dc81dd 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs
@@ -429,6 +429,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			//var overloadTorque = (voltageEntry.OverloadTorque ?? 0.SI<NewtonMeter>()) * count / gearRatioUsedForMeasurement;
 			var overloadTestSpeed = (voltageEntry.OverloadTestSpeed ?? 0.RPMtoRad()) * gearRatioUsedForMeasurement;
 
+			if (overloadTestSpeed.IsEqual(0)) {
+				throw new VectoException("Invalid model parameters for EM overload");
+			}
+
 			if (overloadTestSpeed > continuousTorqueSpeed) {
 				var overloadPwr = (voltageEntry.OverloadTorque ?? 0.SI<NewtonMeter>()) * count *
 								(voltageEntry.OverloadTestSpeed ?? 0.RPMtoRad());