Index: vm/vmcore/src/class_support/Resolve.cpp =================================================================== --- vm/vmcore/src/class_support/Resolve.cpp (revision 499752) +++ vm/vmcore/src/class_support/Resolve.cpp (working copy) @@ -114,9 +114,11 @@ tmn_suspend_disable(); target->lock(); - // vvv - This should be atomic change - cp.resolve_as_error(cp_index, exn); - // ^^^ + if (!cp.is_entry_in_error(cp_index)) { + // vvv - This should be atomic change + cp.resolve_as_error(cp_index, exn); + // ^^^ + } target->unlock(); tmn_suspend_enable(); }