Index: vm/vmcore/src/init/vm_main.cpp =================================================================== --- vm/vmcore/src/init/vm_main.cpp (revision 423505) +++ vm/vmcore/src/init/vm_main.cpp (working copy) @@ -266,6 +266,10 @@ JNIEnv* jenv = (JNIEnv*) jni_native_intf; + // Make shutdown resisitant to possible exceptions left in JNI code + if (jenv->ExceptionOccurred()) + PROCESS_EXCEPTION("Exception left unhandled before destroying VM"); + jclass start_class = jenv->FindClass("java/lang/VMStart"); if (jenv->ExceptionOccurred() || !start_class) PROCESS_EXCEPTION("can't find starter class: java/lang/VMStart");