diff --git a/lib/excon/socket.rb b/lib/excon/socket.rb
index d2d256bf..e5b53695 100644
--- a/lib/excon/socket.rb
+++ b/lib/excon/socket.rb
@@ -60,7 +60,7 @@ def read(max_length = nil)
     def readline
       return legacy_readline if RUBY_VERSION.to_f <= 1.8_7
       buffer = String.new
-      buffer << read_nonblock(1) while buffer[-1] != "\n"
+      buffer << (read_nonblock(1) || raise(EOFError)) while buffer[-1] != "\n"
       buffer
     end