diff --git a/.hgtags b/.hgtags
index 251e4eba8da9e78f237a5db0ad41b96a81b9b305..76082d90177edc404a5d2495ec0025c5b15e16e9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1303,3 +1303,4 @@ ff1c3c1867b502c289c7c08ebc712663ec657f06 jdk8u252-b04
 9003f35baaa0d57d225bf72cf82fb0a8ee049c98 jdk8u262-b00
 b4fd7e078c54a23ed44f09aec3f6938bed3e3630 jdk8u252-b06
 d17814ea88e3aa0a2f2fdb125e35a878ee27fe3e jdk8u252-b07
+8f2780b3e4faf4792ac885f470bb1602d4ca5526 jdk8u252-b08
diff --git a/src/share/vm/runtime/thread.cpp b/src/share/vm/runtime/thread.cpp
index 6e22da3603f4599f973d55be6726d38b355bf4fb..7d04bef08587d983f454cc9c8f63bcf6da7725f4 100644
--- a/src/share/vm/runtime/thread.cpp
+++ b/src/share/vm/runtime/thread.cpp
@@ -836,7 +836,9 @@ bool Thread::claim_oops_do_par_case(int strong_roots_parity) {
 }
 
 void Thread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
-  active_handles()->oops_do(f);
+  if (active_handles() != NULL) {
+    active_handles()->oops_do(f);
+  }
   // Do oop for ThreadShadow
   f->do_oop((oop*)&_pending_exception);
   handle_area()->oops_do(f);