1 files changed, 7 insertions, 2 deletions
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 0668e27b05..48d9fcd4ec 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -147,8 +147,13 @@ module WEBrick
       Thread.start{
         begin
           Thread.current[:WEBrickSocket] = sock
-          addr = sock.peeraddr
-          @logger.debug "accept: #{addr[3]}:#{addr[1]}"
+          begin
+            addr = sock.peeraddr
+            @logger.debug "accept: #{addr[3]}:#{addr[1]}"
+          rescue SocketError
+            @logger.debug "accept: <address unknown>"
+            raise
+          end
           call_callback(:AcceptCallback, sock)
           block ? block.call(sock) : run(sock)
         rescue Errno::ENOTCONN