1 files changed, 4 insertions, 6 deletions
diff --git a/app/scripts/lib/port-stream.js b/app/scripts/lib/port-stream.js
index 1889e3c04..607a9c9ed 100644
--- a/app/scripts/lib/port-stream.js
+++ b/app/scripts/lib/port-stream.js
@@ -30,8 +30,7 @@ PortDuplexStream.prototype._onMessage = function (msg) {
 
 PortDuplexStream.prototype._onDisconnect = function () {
   try {
-    // this.end()
-    this.emit('close')
+    this.push(null)
   } catch (err) {
     this.emit('error', err)
   }
@@ -52,12 +51,11 @@ PortDuplexStream.prototype._write = function (msg, encoding, cb) {
       // console.log('PortDuplexStream - sent message', msg)
       this._port.postMessage(msg)
     }
-    cb()
   } catch (err) {
-    console.error(err)
-    // this.emit('error', err)
-    cb(new Error('PortDuplexStream - disconnected'))
+    // console.error(err)
+    return cb(new Error('PortDuplexStream - disconnected'))
   }
+  cb()
 }
 
 // util