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::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; }