--- a/src/core/CLucene/util/ThreadLocal.cpp
+++ b/src/core/CLucene/util/ThreadLocal.cpp
@@ -122,6 +122,8 @@ _ThreadLocal::_ThreadLocal ( CL_NS ( util ) ::AbstractDeletor* _deletor ) :
 
 _ThreadLocal::~_ThreadLocal()
 {
+	setNull();
+	UnregisterCurrentThread();
 	delete _internal;
 }