diff --git a/ChangeLog b/ChangeLog
index a00277a2d2..5c89a73347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 15 09:44:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): reg_fragment_setenc might not raise an
+	  exception before rb_reg_compile.
+
 Fri Feb 15 07:37:40 2008  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
diff --git a/parse.y b/parse.y
index 90098a6f99..0c8eb7ab9a 100644
--- a/parse.y
+++ b/parse.y
@@ -8655,10 +8655,14 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options)
     re = rb_reg_compile(str, options & RE_OPTION_MASK);
     if (NIL_P(re)) {
 	ID mesg = rb_intern("mesg");
-	VALUE m = rb_attr_get(err, mesg);
-	rb_str_cat(m, "\n", 1);
-	rb_str_append(m, rb_attr_get(rb_errinfo(), mesg));
+	VALUE m = rb_attr_get(rb_errinfo(), mesg);
 	rb_set_errinfo(err);
+	if (!NIL_P(err)) {
+	    rb_str_append(rb_str_cat(rb_attr_get(err, mesg), "\n", 1), m);
+	}
+	else {
+	    compile_error(PARSER_ARG "%s", RSTRING_PTR(m));
+	}
 	return Qnil;
     }
     return re;