From 3675d6a6b119fb384a8dd21b1b5bd0d8f6829019 Mon Sep 17 00:00:00 2001
From: Gliniak <Gliniak93@gmail.com>
Date: Sat, 20 Jan 2024 13:20:06 +0100
Subject: [PATCH] [Kernel] Fixed nullptr in latest Guest->Host mapping revert

---
 src/xenia/kernel/xobject.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xenia/kernel/xobject.cc b/src/xenia/kernel/xobject.cc
index 1a0d7be21..035ec41f0 100644
--- a/src/xenia/kernel/xobject.cc
+++ b/src/xenia/kernel/xobject.cc
@@ -434,7 +434,9 @@ object_ref<XObject> XObject::GetNativeObject(KernelState* kernel_state,
     }
     // Stash pointer in struct.
     // FIXME: This assumes the object contains a dispatch header (some don't!)
-    StashHandle(header, object->handle());
+    if (object) {
+      StashHandle(header, object->handle());
+    }
     result = object;
   }