1 files changed, 4 insertions, 4 deletions
diff --git a/eval.c b/eval.c
index 3003139dae..8a2072322b 100644
--- a/eval.c
+++ b/eval.c
@@ -2219,13 +2219,13 @@ rb_eval(self, n)
 			    result = rb_eval(self, resq->nd_body);
 			}
 			POP_TAG();
-			if (state == 0) {
-			    ruby_errinfo = e_info;
-			}
-			else if (state == TAG_RETRY) {
+			if (state == TAG_RETRY) {
 			    state = 0;
 			    goto retry_entry;
 			}
+			if (state != TAG_RAISE) {
+			    ruby_errinfo = e_info;
+			}
 			break;
 		    }
 		    resq = resq->nd_head; /* next rescue */