From 4c22341052b35954980fe2acccc53580d72d29d3 Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Mon, 23 Nov 2020 12:52:55 +0000
Subject: [PATCH] Even more safety

---
 Source/StevesUEHelpers/Public/StevesUEHelpers.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/StevesUEHelpers/Public/StevesUEHelpers.h b/Source/StevesUEHelpers/Public/StevesUEHelpers.h
index 34dcfea..69037a9 100644
--- a/Source/StevesUEHelpers/Public/StevesUEHelpers.h
+++ b/Source/StevesUEHelpers/Public/StevesUEHelpers.h
@@ -20,10 +20,11 @@ public:
 
 inline UStevesGameSubsystem* GetStevesGameSubsystem(UWorld* WorldContext)
 {
-	if (IsValid(WorldContext) && IsValid(WorldContext->GetGameInstance()) &&
-		WorldContext->IsGameWorld())
+	if (IsValid(WorldContext) && WorldContext->IsGameWorld())
 	{
-		return WorldContext->GetGameInstance()->GetSubsystem<UStevesGameSubsystem>();		
+		auto GI = WorldContext->GetGameInstance();
+		if (IsValid(GI))
+			return GI->GetSubsystem<UStevesGameSubsystem>();		
 	}
 		
 	return nullptr;