diff --git a/lib/storage/tasks.js b/lib/storage/tasks.js
index bb4dbdb9c..3c50f8ce7 100644
--- a/lib/storage/tasks.js
+++ b/lib/storage/tasks.js
@@ -102,6 +102,7 @@ var list = Tasks.list = function (env, cb, migration) {
                     root: env.root,
                     error: e,
                 });
+                w.abort();
                 return void cb(e);
             }
             if (list.length === 0) {
diff --git a/server.js b/server.js
index 7b0e93687..9b82d7c3c 100644
--- a/server.js
+++ b/server.js
@@ -55,7 +55,7 @@ if (process.env.PACKAGE) {
         config.httpPort = 3000;
     }
 
-    if (typeof(httpSafeOrigin) !== 'string') {
+    if (typeof(config.httpSafeOrigin) !== 'string') {
         if (typeof(config.httpSafePort) !== 'number') {
             config.httpSafePort = config.httpPort + 1;
         }