diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index c59534e406e5ace26bd0066a4267472f18e1b470..2f2e1d80e3754f52420d8df58478dafd2f22d630 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1411,13 +1411,6 @@ lbFound:
 
     'Open Job Editor and open file (or new file)
     Friend Sub OpenVECTOeditor(filePathOrType As String, Optional jobType As VectoSimulationJobType = Nothing)
-        Dim jobDataProvider As IInputDataProvider = JSONInputDataFactory.ReadComponentData(filePathOrType)
-        Dim vtpEngineeringJob As IVTPEngineeringInputDataProvider = TryCast(jobDataProvider, IVTPEngineeringInputDataProvider)
-        Dim vtpDeclarationJob As IVTPDeclarationInputDataProvider = TryCast(jobDataProvider, IVTPDeclarationInputDataProvider)
-
-        'Declaration is the base class for EngineeringJobInputData, hence is valid for both Eng. and Decl.
-        If jobType = Nothing Then jobType = TryCast(jobDataProvider, IDeclarationJobInputData).JobType
-
         If filePathOrType = "<New>" Then
             ShowVectoJobForm(jobType)
             VectoJobForm.VectoNew()
@@ -1426,6 +1419,14 @@ lbFound:
             VectoVTPJobForm.VectoNew()
         Else
             Try
+                Dim jobDataProvider As IInputDataProvider = JSONInputDataFactory.ReadComponentData(filePathOrType)
+
+                'Declaration is the base class for EngineeringJobInputData, hence is valid for both Eng. and Decl.
+                If jobType = Nothing Then jobType = TryCast(jobDataProvider, IDeclarationJobInputData).JobType
+
+                Dim vtpEngineeringJob As IVTPEngineeringInputDataProvider = TryCast(jobDataProvider, IVTPEngineeringInputDataProvider)
+                Dim vtpDeclarationJob As IVTPDeclarationInputDataProvider = TryCast(jobDataProvider, IVTPDeclarationInputDataProvider)
+
                 If vtpEngineeringJob Is Nothing AndAlso vtpDeclarationJob Is Nothing Then
                     ShowVectoJobForm(jobType)
                     VectoJobForm.VECTOload2Form(filePathOrType)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 3b6938683f9d4fe98a8681efcb457395535a86aa..a271cb1e0ebe2a08b4cd102ecc487c8b7a3d25be 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -165,7 +165,9 @@ Public Class VectoJobForm
             Case VectoSimulationJobType.ConventionalVehicle, VectoSimulationJobType.ParallelHybridVehicle, VectoSimulationJobType.IHPC, VectoSimulationJobType.SerialHybridVehicle, VectoSimulationJobType.IEPC_S
                 auxList = New HeavyLorryAuxiliaryDataAdapter().AuxiliaryTypes.OrderBy(Function(x) x).ToList()
             Case VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E
-                auxList = new HeavyLorryPEVAuxiliaryDataAdapter().AuxiliaryTypes.OrderBy(Function(x) x).ToList()
+                auxList = New HeavyLorryPEVAuxiliaryDataAdapter().AuxiliaryTypes.OrderBy(Function(x) x).ToList()
+            Case Else
+                auxList = New List(Of AuxiliaryType)
         End Select
 
         Dim auxTechs = New Dictionary(Of AuxiliaryType, IDeclarationAuxiliaryTable) from {