Index: src/OFThread.m ================================================================== --- src/OFThread.m +++ src/OFThread.m @@ -267,12 +267,16 @@ { of_list_object_t *iter; @synchronized (tlskeys) { for (iter = [tlskeys firstListObject]; iter != NULL; - iter = iter->next) - ((OFTLSKey*)iter->object)->destructor(iter->object); + iter = iter->next) { + OFTLSKey *key = (OFTLSKey*)iter->object; + + if (key->destructor != NULL) + key->destructor(iter->object); + } } } - init {