diff --git a/ChangeLog b/ChangeLog
index c21dddc440..17a6a36864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 25 22:28:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite_string): Test writev() failure.
+
 Sat Oct 25 20:19:19 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
 
 	* test/test-unicode_normalize.rb: added test_us_ascii.
diff --git a/io.c b/io.c
index 3a0cc01e04..290e8b1de3 100644
--- a/io.c
+++ b/io.c
@@ -1276,6 +1276,9 @@ io_binwrite_string(VALUE arg)
 
 	r = rb_writev_internal(fptr->fd, iov, 2);
 
+        if (r == -1)
+            return -1;
+
 	if (fptr->wbuf.len <= r) {
 	    r -= fptr->wbuf.len;
 	    fptr->wbuf.off = 0;
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 557ad0897b..18157fabf1 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1370,6 +1370,17 @@ class TestIO < Test::Unit::TestCase
     end
   end
 
+  def test_close_read_pipe_nosync
+    assert_separately([], <<-"end;")
+      r, w = IO.pipe
+      r.close
+      w.sync = false
+      assert_raise(Errno::EPIPE) {
+        loop { w.write "a" }
+      }
+    end;
+  end
+
   def test_close_read_non_readable
     with_pipe do |r, w|
       assert_raise(IOError) do