diff --git a/ChangeLog b/ChangeLog
index da3077f5c8..6dbf72fb48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 22 00:31:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): check recvmsg error
+	  earlier.
+
 Fri Feb 20 23:28:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* util.c (rv_alloc, freedtoa): use our normal xmalloc()/xfree() because
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index a949fba535..e88829db9b 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1290,6 +1290,9 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
         goto retry;
     }
 
+    if (ss == -1)
+	rb_sys_fail("recvmsg(2)");
+
     if (grow_buffer) {
 	int grown = 0;
 #if defined(HAVE_ST_MSG_CONTROL)
@@ -1321,9 +1324,6 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
         }
     }
 
-    if (ss == -1)
-	rb_sys_fail("recvmsg(2)");
-
     if (NIL_P(dat_str))
         dat_str = rb_tainted_str_new(datbuf, ss);
     else {