diff --git a/ChangeLog b/ChangeLog
index b9daf5a5f0..ff08cd1301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 22:04:58 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): unify conditions.
+
 Sat Dec 22 21:47:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* io.c (rb_io_wait_writable): use rb_thread_check_ints() instead
diff --git a/cont.c b/cont.c
index 8521a07d76..1f4c2cfde0 100644
--- a/cont.c
+++ b/cont.c
@@ -1161,10 +1161,7 @@ rb_fiber_start(void)
     TH_POP_TAG();
 
     if (state) {
-	if (state == TAG_RAISE) {
-	    rb_threadptr_async_errinfo_enque(th, th->errinfo);
-	}
-	else if (state == TAG_FATAL) {
+	if (state == TAG_RAISE || state == TAG_FATAL) {
 	    rb_threadptr_async_errinfo_enque(th, th->errinfo);
 	}
 	else {