@@ -146,14 +146,14 @@
 			thread->_returnValue = [[thread main] retain];
 	}
 
 	[thread handleTermination];
 
-	thread->_running = OF_THREAD_WAITING_FOR_JOIN;
-
 	objc_autoreleasePoolPop(thread->_pool);
 	[OFAutoreleasePool of_handleThreadTermination];
+
+	thread->_running = OF_THREAD_WAITING_FOR_JOIN;
 
 	[thread release];
 }
 #elif defined(OF_HAVE_SOCKETS)
 static OFDNSResolver *DNSResolver;
@@ -331,10 +331,12 @@
 
 	OF_ENSURE(thread != nil);
 
 	thread->_returnValue = [object retain];
 	longjmp(thread->_exitEnv, 1);
+
+	OF_UNREACHABLE
 }
 
 + (void)setName: (OFString *)name
 {
 	[OFThread currentThread].name = name;