diff --git a/lib/Local.js b/lib/Local.js
index 7486bc7..404488f 100644
--- a/lib/Local.js
+++ b/lib/Local.js
@@ -94,10 +94,10 @@ function Local(){
             fs.unlinkSync(that.binaryPath);
             delete(that.binaryPath);
             that.start(options, callback);
-            return;
           } else {
             callback(new LocalError(error.toString()));
           }
+          return;
         }
 
         var data = {};
@@ -106,7 +106,7 @@ function Local(){
         else if(stderr)
           data = JSON.parse(stderr);
         else
-          callback(new LocalError('No output received'));
+          return callback(new LocalError('No output received'));
 
         if(data['state'] != 'connected'){
           callback(new LocalError(data['message']['message']));
@@ -123,10 +123,10 @@ function Local(){
     return this.pid && running(this.pid) && this.isProcessRunning;
   };
 
-  this.stop = function (callback) {
+  this.stop = function(callback) {
     if(!this.pid) return callback();
     this.killAllProcesses(function(error){
-      if(error) callback(new LocalError(error.toString()));
+      if(error) return callback(new LocalError(error.toString()));
       callback();
     });
   };
@@ -316,6 +316,7 @@ function Local(){
 
   this.killAllProcesses = function(callback){
     psTree(this.pid, (err, children) => {
+      if(err) return callback(err);
       var childPids = children.map(val => val.PID);
       var killChecker = setInterval(() => {
         if(childPids.length === 0) {