diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
index 4d30ffaa4111ef89090656224f3d57a259ebe249..54469702f89c708aade00d5f2f47beb82b3cf7e2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
@@ -66,17 +66,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Auxiliaries
         {
 			switch (dataBus.PowertrainInfo.VehicleArchitecutre) {
 				case VectoSimulationJobType.BatteryElectricVehicle:
+				case VectoSimulationJobType.IEPC_E:
 				case VectoSimulationJobType.SerialHybridVehicle:
+				case VectoSimulationJobType.IEPC_S:
 					return GetPEV_SHEV_PowerDemand(dataBus);
 				case VectoSimulationJobType.ParallelHybridVehicle:
 					return GetP_HEV_PowerDemand(dataBus);
 				case VectoSimulationJobType.EngineOnlySimulation:
-				case VectoSimulationJobType.IEPC_E:
-				case VectoSimulationJobType.IEPC_S:
 				case VectoSimulationJobType.IHPC:
 				case VectoSimulationJobType.ConventionalVehicle:
 				default:
-					throw new ArgumentOutOfRangeException();
+					throw new ArgumentOutOfRangeException($"{nameof(dataBus)}");
 			}
 		}