1 files changed, 2 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index 118dd13ca8..da15fd2675 100644
--- a/vm.c
+++ b/vm.c
@@ -1162,6 +1162,7 @@ vm_exec(rb_thread_t *th)
     _tag.retval = Qnil;
     if ((state = EXEC_TAG()) == 0) {
       vm_loop_start:
+	_th->tag = &_tag;
 	result = vm_exec_core(th, initial);
 	if ((state = th->state) != 0) {
 	    err = result;
@@ -1180,6 +1181,7 @@ vm_exec(rb_thread_t *th)
 	err = th->errinfo;
 
       exception_handler:
+	TH_POP_TAG2();
 	cont_pc = cont_sp = catch_iseqval = 0;
 
 	while (th->cfp->pc == 0 || th->cfp->iseq == 0) {
@@ -1373,7 +1375,6 @@ vm_exec(rb_thread_t *th)
 	    if (VM_FRAME_TYPE_FINISH_P(th->cfp)) {
 		vm_pop_frame(th);
 		th->errinfo = err;
-		TH_POP_TAG2();
 		JUMP_TAG(state);
 	    }
 	    else {