From eb914ae77d07c2f36018c9cdd44e1aea4d973844 Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Tue, 10 Feb 2026 00:22:42 +0900
Subject: [PATCH] [Kernel] Return null on handle type mismatch instead of
 asserting

---
 src/xenia/kernel/util/object_table.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xenia/kernel/util/object_table.h b/src/xenia/kernel/util/object_table.h
index c055210a4..694251384 100644
--- a/src/xenia/kernel/util/object_table.h
+++ b/src/xenia/kernel/util/object_table.h
@@ -51,7 +51,10 @@ class ObjectTable {
   object_ref<T> LookupObject(X_HANDLE handle, bool already_locked = false) {
     auto object = LookupObject(handle, already_locked);
     if (object) {
-      assert_true(object->type() == T::kObjectType);
+      if (object->type() != T::kObjectType) {
+        object->Release();
+        return object_ref<T>();
+      }
     }
     auto result = object_ref<T>(reinterpret_cast<T*>(object));
     return result;