diff --git a/ChangeLog b/ChangeLog
index ca7575cf9a..5f961f0404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): keep the exception till after END blocks.
+	  [ruby-core:09675]
+
 Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
diff --git a/eval.c b/eval.c
index 2b6fda37f7..dff4dc1c75 100644
--- a/eval.c
+++ b/eval.c
@@ -1564,7 +1564,6 @@ ruby_cleanup(ex)
     ruby_safe_level = 0;
     Init_stack((void*)&state);
     ruby_finalize_0();
-    if (ruby_errinfo) err = ruby_errinfo;
     PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
     if ((state = EXEC_TAG()) == 0) {