--- a/hotspot/src/share/vm/runtime/vmThread.cpp	Wed Apr 02 16:08:59 2014 +0100
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp	Wed Apr 02 18:40:52 2014 +0200
@@ -305,6 +305,9 @@
     _terminate_lock->notify();
   }
 
+  // Thread destructor usually does this.
+  ThreadLocalStorage::set_thread(NULL);
+
   // Deletion must be done synchronously by the JNI DestroyJavaVM thread
   // so that the VMThread deletion completes before the main thread frees
   // up the CodeHeap.