diff --git a/ChangeLog b/ChangeLog
index e85410eaff..f3ff993c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 24 22:14:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
+	  exception raised.
+
 Tue Jun 24 22:09:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
diff --git a/vm_eval.c b/vm_eval.c
index 7f01781d3b..8e4ddad2fd 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -664,12 +664,14 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
     rb_thread_t *th = GET_THREAD();
     rb_env_t *env = NULL;
     rb_block_t block;
+    volatile int parse_in_eval;
 
     if (file == 0) {
 	file = rb_sourcefile();
 	line = rb_sourceline();
     }
 
+    parse_in_eval = th->parse_in_eval;
     PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	rb_iseq_t *iseq;
@@ -726,6 +728,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 	result = vm_eval_body(th);
     }
     POP_TAG();
+    th->parse_in_eval = parse_in_eval;
 
     if (state) {
 	if (state == TAG_RAISE) {