diff --git a/dist/autoloader.js b/dist/autoloader.js
index 2702c55..bd7294c 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Fri Jan 11 2019 02:21:48 GMT+0100 (CET)*/
+/*Generated on:Fri Jan 11 2019 02:33:00 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();
diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js
index 7faecf5..849863f 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Fri Jan 11 2019 02:21:48 GMT+0100 (CET)*/
+/*Generated on:Fri Jan 11 2019 02:33:00 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18819,26 +18819,34 @@ class AutomaticDispose {
     CollectInvolvedVehicles() {
         let self = this;
         $("#mission_vehicle_driving tbody").find("tr").each(function (_, elem) {
-            var VehicleID = $(elem).find("a").first().attr("href").substr($(elem).find("a").first().attr("href").lastIndexOf("/") + 1);
-            var VehicleName = $(elem).find("a").first().text();
-            var VehicleType = $(elem).find("a").first().attr("vehicle_type_id");
+            var f = $(elem).find("a").first()
+            var attr = f.attr("href")
+            if (typeof attr !== 'undefined' && attr !== false) {
+                var VehicleID = f.attr("href").substr(f.attr("href").lastIndexOf("/") + 1);
+                var VehicleName = f.text();
+                var VehicleType = f.attr("vehicle_type_id");
 
-            self.Vehicles[VehicleID] = {
-                "id": VehicleID,
-                "name": VehicleName,
-                "type": VehicleType
+                self.Vehicles[VehicleID] = {
+                    "id": VehicleID,
+                    "name": VehicleName,
+                    "type": VehicleType
+                }
             }
         });
 
         $("#mission_vehicle_at_mission tbody").find("tr").each(function (_, elem) {
-            var VehicleID = $(elem).find("a").first().attr("href").substr($(elem).find("a").first().attr("href").lastIndexOf("/") + 1);
-            var VehicleName = $(elem).find("a").first().text();
-            var VehicleType = $(elem).find("a").first().attr("vehicle_type_id");
+            var f = $(elem).find("a").first()
+            var attr = f.attr("href")
+            if (typeof attr !== 'undefined' && attr !== false) {
+                var VehicleID = f.attr("href").substr(f.attr("href").lastIndexOf("/") + 1);
+                var VehicleName = f.text();
+                var VehicleType = f.attr("vehicle_type_id");
 
-            self.Vehicles[VehicleID] = {
-                "id": VehicleID,
-                "name": VehicleName,
-                "type": VehicleType
+                self.Vehicles[VehicleID] = {
+                    "id": VehicleID,
+                    "name": VehicleName,
+                    "type": VehicleType
+                }
             }
         });
 
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 753b11e..0070c0e 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1465,26 +1465,34 @@ class AutomaticDispose {
     CollectInvolvedVehicles() {
         let self = this;
         $("#mission_vehicle_driving tbody").find("tr").each(function (_, elem) {
-            var VehicleID = $(elem).find("a").first().attr("href").substr($(elem).find("a").first().attr("href").lastIndexOf("/") + 1);
-            var VehicleName = $(elem).find("a").first().text();
-            var VehicleType = $(elem).find("a").first().attr("vehicle_type_id");
+            var f = $(elem).find("a").first()
+            var attr = f.attr("href")
+            if (typeof attr !== 'undefined' && attr !== false) {
+                var VehicleID = f.attr("href").substr(f.attr("href").lastIndexOf("/") + 1);
+                var VehicleName = f.text();
+                var VehicleType = f.attr("vehicle_type_id");
 
-            self.Vehicles[VehicleID] = {
-                "id": VehicleID,
-                "name": VehicleName,
-                "type": VehicleType
+                self.Vehicles[VehicleID] = {
+                    "id": VehicleID,
+                    "name": VehicleName,
+                    "type": VehicleType
+                }
             }
         });
 
         $("#mission_vehicle_at_mission tbody").find("tr").each(function (_, elem) {
-            var VehicleID = $(elem).find("a").first().attr("href").substr($(elem).find("a").first().attr("href").lastIndexOf("/") + 1);
-            var VehicleName = $(elem).find("a").first().text();
-            var VehicleType = $(elem).find("a").first().attr("vehicle_type_id");
+            var f = $(elem).find("a").first()
+            var attr = f.attr("href")
+            if (typeof attr !== 'undefined' && attr !== false) {
+                var VehicleID = f.attr("href").substr(f.attr("href").lastIndexOf("/") + 1);
+                var VehicleName = f.text();
+                var VehicleType = f.attr("vehicle_type_id");
 
-            self.Vehicles[VehicleID] = {
-                "id": VehicleID,
-                "name": VehicleName,
-                "type": VehicleType
+                self.Vehicles[VehicleID] = {
+                    "id": VehicleID,
+                    "name": VehicleName,
+                    "type": VehicleType
+                }
             }
         });