1 files changed, 3 insertions, 1 deletions
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 4d245780a5..3fb8d0ecce 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -98,10 +98,12 @@ module DRb
       @socket.close
       File.unlink(path) if @server_mode
       @socket = nil
+      close_shutdown_pipe
     end
 
     def accept
-      s = @socket.accept
+      s = accept_or_shutdown
+      return nil unless s
       self.class.new(nil, s, @config)
     end