@@ -175,10 +175,13 @@
 }
 
 + (OFMutableDictionary *)threadDictionary
 {
 	OFThread *thread = of_tlskey_get(threadSelfKey);
+
+	if (thread == nil)
+		return nil;
 
 	if (thread->_threadDictionary == nil)
 		thread->_threadDictionary = [[OFMutableDictionary alloc] init];
 
 	return thread->_threadDictionary;