Index: vm/vmcore/src/class_support/Verifier_stub.cpp =================================================================== --- vm/vmcore/src/class_support/Verifier_stub.cpp (revision 488528) +++ vm/vmcore/src/class_support/Verifier_stub.cpp (working copy) @@ -123,12 +123,23 @@ if( result != VER_OK ) { unlock(); if( result == VER_ErrorLoadClass ) { - REPORT_FAILED_CLASS_CLASS(m_class_loader, this, - VM_Global_State::loader_env->JavaLangNoClassDefFoundError_String->bytes, - error); + if (exn_raised()){ + assert (exn_get()); + exn_raise_object(exn_get()); + } + else{ + REPORT_FAILED_CLASS_CLASS(m_class_loader, this, + VM_Global_State::loader_env->JavaLangNoClassDefFoundError_String->bytes, error); + } } else { - REPORT_FAILED_CLASS_CLASS(m_class_loader, this, - "java/lang/VerifyError", error); + if (exn_raised()){ + assert (exn_get()); + exn_raise_object(exn_get()); + } + else{ + REPORT_FAILED_CLASS_CLASS(m_class_loader, this, + "java/lang/VerifyError", error); + } } return false; }