diff --git a/ChangeLog b/ChangeLog
index b943177e8e..b305580caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 04:18:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval_cmd): just return if no exceptions.
+	  [ruby-dev:30820]
+
 Wed May 30 02:14:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* signal.c (interrupt_init): needs to pass nil for Interrupt.
diff --git a/eval.c b/eval.c
index 106f2c95aa..31b9bd1b65 100644
--- a/eval.c
+++ b/eval.c
@@ -333,7 +333,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
     POP_TAG();
 
     rb_set_safe_level_force(safe);
-    th_jump_tag_but_local_jump(state, val);
+    if (state) th_jump_tag_but_local_jump(state, val);
     return val;
 }