Index: libs/thread/src/win32/thread.cpp =================================================================== --- libs/thread/src/win32/thread.cpp (revision 65950) +++ libs/thread/src/win32/thread.cpp (working copy) @@ -586,8 +586,11 @@ else { detail::thread_data_base* const current_thread_data(get_or_make_current_thread_data()); - tss_data_node* const new_node=heap_new(key,func,tss_data,current_thread_data->tss_data); - current_thread_data->tss_data=new_node; + if (current_thread_data) + { + tss_data_node* const new_node=heap_new(key,func,tss_data,current_thread_data->tss_data); + current_thread_data->tss_data=new_node; + } } } }