--- a/hotspot/src/share/vm/runtime/java.cpp	Tue Jun 20 17:00:07 2017 +0800
+++ b/hotspot/src/share/vm/runtime/java.cpp	Wed Jun 21 10:28:27 2017 -0700
@@ -437,6 +437,7 @@
   Thread* THREAD = thread;
   JVMCIRuntime::shutdown(THREAD);
   if (HAS_PENDING_EXCEPTION) {
+    HandleMark hm(THREAD);
     Handle exception(THREAD, PENDING_EXCEPTION);
     CLEAR_PENDING_EXCEPTION;
     java_lang_Throwable::java_printStackTrace(exception, THREAD);