diff --git a/src/thread/CommonThreadPartsTrait.php b/src/thread/CommonThreadPartsTrait.php
index e1c9d7c6b..de606a7b2 100644
--- a/src/thread/CommonThreadPartsTrait.php
+++ b/src/thread/CommonThreadPartsTrait.php
@@ -94,7 +94,17 @@ trait CommonThreadPartsTrait{
 		}
 	}
 
-	public function getCrashInfo() : ?ThreadCrashInfo{ return $this->crashInfo; }
+	public function getCrashInfo() : ?ThreadCrashInfo{
+		//TODO: Joining a crashed worker might be a bit sus, but we need to make sure the thread's shutdown
+		//handler has run before we try to collect the crash info. As of 6.1.1, pmmpthread sets isTerminated=true
+		//*before* the shutdown handler is invoked, so we might land here before the crash info has been set.
+		//In the future this should probably be fixed by running the shutdown handlers before setting isTerminated,
+		//but this workaround should be good enough for now.
+		if($this->isTerminated() && !$this->isJoined()){
+			$this->join();
+		}
+		return $this->crashInfo;
+	}
 
 	public function start(int $options = NativeThread::INHERIT_NONE) : bool{
 		ThreadManager::getInstance()->add($this);