diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 138a18b29388bf2ef339d198a35a3e535ba7b46e..f04c2e0ab98aa3ff34adb4fd871d1c1fbe5ebdf6 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -449,13 +449,15 @@ Public Class VectoJobForm
 
 		End If
 
-		Dim sb As ICycleData
-		For Each sb In vectoJob.Cycles
-			Dim lv0 As ListViewItem = New ListViewItem
-			lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name
-			LvCycles.Items.Add(lv0)
-		Next
-
+		Try
+			Dim sb As ICycleData
+			For Each sb In vectoJob.Cycles
+				Dim lv0 As ListViewItem = New ListViewItem
+				lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name
+				LvCycles.Items.Add(lv0)
+			Next
+		Catch ex As Exception
+		End Try
 		CbEngOnly.Checked = vectoJob.EngineOnlyMode
 
 		If driver.OverSpeedEcoRoll.Mode = DriverMode.EcoRoll Then
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 91237d27a17cb79c12b3ededfc467304ee442908..94be7b9c2f2469acaa99e909ffe6a36989be9807 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -339,6 +339,7 @@ Public Class VehicleForm
 			End Select
 		End If
 
+		_vehFile = file
 		Dim basePath As String = Path.GetDirectoryName(file)
 		CbCat.SelectedValue = vehicle.VehicleCategory
 		CbAxleConfig.SelectedValue = vehicle.AxleConfiguration
@@ -396,7 +397,7 @@ Public Class VehicleForm
 		VehicleFileBrowser.UpdateHistory(file)
 		Text = GetFilenameWithoutPath(file, True)
 		LbStatus.Text = ""
-		_vehFile = file
+
 		Activate()
 
 		_changed = False