diff --git a/Source/Async/ThreadPool.cpp b/Source/Async/ThreadPool.cpp
index 772827e0..3576acdf 100644
--- a/Source/Async/ThreadPool.cpp
+++ b/Source/Async/ThreadPool.cpp
@@ -738,7 +738,13 @@ namespace Aurora::Async
 
     AuThreads::ThreadShared_t ThreadPool::ResolveHandle(WorkerId_t id)
     {
-        return GetThreadHandle(id)->threadObject;
+        auto pState = GetThreadHandle(id);
+        if (!pState)
+        {
+            return {};
+        }
+
+        return pState->threadObject;
     }
     
     AuBST<ThreadGroup_t, AuList<ThreadId_t>> ThreadPool::GetThreads()