From 06777aa928c2a45d0b601fd40020a788b10e458b Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Thu, 1 Oct 2020 05:52:44 -0600
Subject: [PATCH] Added null check in driver creation

---
 SceneManager/VehicleCollector.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/SceneManager/VehicleCollector.cs b/SceneManager/VehicleCollector.cs
index 98252ac..bc876ae 100644
--- a/SceneManager/VehicleCollector.cs
+++ b/SceneManager/VehicleCollector.cs
@@ -103,12 +103,19 @@ namespace SceneManager
                     {
                         GameFiber.Yield();
                     }
-                    var driverBlip = v.Driver.AttachBlip();
-                    driverBlip.Color = Color.Green;
-                    driverBlip.Scale = 0.25f;
-                    v.Driver.IsPersistent = true;
-                    v.Driver.BlockPermanentEvents = true;
-                    Logger.Log($"A missing driver was created for {v.Model.Name}.");
+                    if(v && v.Driver)
+                    {
+                        var driverBlip = v.Driver.AttachBlip();
+                        driverBlip.Color = Color.Green;
+                        driverBlip.Scale = 0.25f;
+                        v.Driver.IsPersistent = true;
+                        v.Driver.BlockPermanentEvents = true;
+                        Logger.Log($"A missing driver was created for {v.Model.Name}.");
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
                 return true;
             }