From 32d1b71bc6212ef557ad97081d90900bc58b76be Mon Sep 17 00:00:00 2001
From: Ben Naccarato <bennaccarato@improbable.io>
Date: Wed, 13 Feb 2019 14:01:45 +0000
Subject: [PATCH] Wrap with null check to avoid crash bug on quit for
 deployments (#666)

---
 .../SpatialGDK/Private/EngineClasses/SpatialGameInstance.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SpatialGDK/Source/SpatialGDK/Private/EngineClasses/SpatialGameInstance.cpp b/SpatialGDK/Source/SpatialGDK/Private/EngineClasses/SpatialGameInstance.cpp
index a08bb8ea58..b9819e635c 100644
--- a/SpatialGDK/Source/SpatialGDK/Private/EngineClasses/SpatialGameInstance.cpp
+++ b/SpatialGDK/Source/SpatialGDK/Private/EngineClasses/SpatialGameInstance.cpp
@@ -191,7 +191,10 @@ void USpatialGameInstance::Shutdown()
 	UWorld* World = GetWorld();
 	if (World != nullptr && SpatialConnection != nullptr && SpatialConnection->IsConnected())
 	{
-		Cast<USpatialNetDriver>(World->GetNetDriver())->HandleOnDisconnected(TEXT("Client shutdown"));
+		if (World->GetNetDriver() != nullptr)
+		{
+			Cast<USpatialNetDriver>(World->GetNetDriver())->HandleOnDisconnected(TEXT("Client shutdown"));
+		}
 	}
 
 	Super::Shutdown();