diff --git a/daemon.js b/daemon.js
index c2fbcb6..2d6542e 100644
--- a/daemon.js
+++ b/daemon.js
@@ -101,6 +101,12 @@ function shutdown_blockchain() {
 }
 
 function shutdown_storage() {
+  if (storageServer && storageServer.killed) {
+    if (lib.isPidRunning(storageServer.pid)) {
+      console.log('LAUNCHER: killing SS again')
+      process.kill(storageServer.pid, 'SIGKILL')
+    }
+  }
   if (storageServer && !storageServer.killed) {
     // FIXME: was killed not set?
     try {
@@ -530,6 +536,7 @@ function launcherStorageServer(config, args, cb) {
       if (data === undefined) {
         console.log('STORAGE: RPC server not responding, restarting storage server')
         shutdown_storage()
+        // what restarts this? something does
       }
     })
   }
diff --git a/lib.js b/lib.js
index 4368b54..5b35408 100644
--- a/lib.js
+++ b/lib.js
@@ -607,7 +607,9 @@ async function runStorageRPCTest(lokinet, config, cb) {
   var responded = false
   var ref = {
     abort: function () {
-      console.log('runStorageRPCTest abort: never called httpGet?')
+      // usually get this why oxend is syncing...
+      // sometimes httpGet wasn't called
+      console.log('runStorageRPCTest abort or timeout, is oxend syncing?')
     }
   }
   var storage_rpc_timer = setTimeout(function() {