R1:3d8de9c521fe

Do a better job of saving the VM context and restoring it for errors during the callback phase.