diff --git a/lib/server.js b/lib/server.js
index 911da59c..4f1cbbd5 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -21,13 +21,13 @@ function Server (torrent, opts) {
   var _close = server.close
   server.close = function (cb) {
     closed = true
-    torrent = null
     server.removeListener('connection', onConnection)
     server.removeListener('request', onRequest)
     while (pendingReady.length) {
       var onReady = pendingReady.pop()
       torrent.removeListener('ready', onReady)
     }
+    torrent = null
     _close.call(server, cb)
   }
 
@@ -37,6 +37,7 @@ function Server (torrent, opts) {
     })
 
     // Only call `server.close` if user has not called it already
+    if (!cb) cb = function () {}
     if (closed) process.nextTick(cb)
     else server.close(cb)
   }