diff --git a/lib/db.coffee b/lib/db.coffee
index 0484239..5eac2d6 100644
--- a/lib/db.coffee
+++ b/lib/db.coffee
@@ -113,8 +113,8 @@ connect = (callback) ->
 
 
 disconnect = () ->
-  exports.mongoDb.close()
-  redisClient.quit()
+  exports.mongoDb?.close()
+  redisClient?.quit()
 
 
 # Optimize projection by removing overlaps
diff --git a/lib/server.coffee b/lib/server.coffee
index b7aa33a..b36e415 100644
--- a/lib/server.coffee
+++ b/lib/server.coffee
@@ -41,6 +41,12 @@ exit = () ->
   , 30000).unref()
 
   cluster.worker?.disconnect()
+
+  if not server
+    db.disconnect()
+    extensions.killAll()
+    return
+
   server.close(() ->
     db.disconnect()
     extensions.killAll()
@@ -52,7 +58,7 @@ process.on('uncaughtException', (err) ->
     util.error("#{new Date().toISOString()} - #{err.stack}\n")
     exit()
   catch err
-    util.error("#{new Date().toISOString()} - #{err2.stack}\n")
+    util.error("#{new Date().toISOString()} - #{err.stack}\n")
   throw err
 )