1 files changed, 6 insertions, 5 deletions

diff --git a/src/vm.c b/src/vm.c
index 5793e2f74..a610b28c5 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2043,7 +2043,9 @@ RETRY_TRY_BLOCK:
           proc = proc->upper;
           while (mrb->c->cibase < ci &&  ci[-1].proc != proc) {
             if (ci[-1].acc == CI_ACC_SKIP) {
-              mrb->c->ci = ci;
+              while (ci < mrb->c->ci) {
+                cipop(mrb);
+              }
               goto L_BREAK_ERROR;
             }
             ci--;
@@ -2053,6 +2055,9 @@ RETRY_TRY_BLOCK:
           /* cannot happen */
           break;
         }
+        while (ci < mrb->c->ci) {
+          cipop(mrb);
+        }
         while (mrb->c->eidx > ci->epos) {
           ecall_adjust();
         }
@@ -2062,10 +2067,6 @@ RETRY_TRY_BLOCK:
           mrb->jmp = prev_jmp;
           return v;
         }
-        while (ci < mrb->c->ci) {
-          mrb_env_unshare(mrb, mrb->c->ci->env);
-          mrb->c->ci--;
-        }
         acc = ci->acc;
         mrb->c->stack = ci->stackent;
         cipop(mrb);