diff --git a/Dockerfile b/Dockerfile
index 2ffc36e8..217c0df2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sysdig/sysdig:0.27.1
+FROM sysdig/sysdig:0.36.1
 
 
 
diff --git a/build/build.sh b/build/build.sh
index bf68e8de..b51852ce 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SYSDIG_VERSION="0.35.4"
-SYSDIG_VERSION_MAC="0.35.4"
+SYSDIG_VERSION="0.36.1"
+SYSDIG_VERSION_MAC="0.36.1"
 
 # Env parameters
 # - CLEANUP (default: true)
diff --git a/ember-electron/backend/controller.js b/ember-electron/backend/controller.js
index 2afd1bc5..d82d0868 100644
--- a/ember-electron/backend/controller.js
+++ b/ember-electron/backend/controller.js
@@ -72,7 +72,11 @@ class Controller {
         //
         let execState = 'STARTED';
 
+        let stderrPresent = false;
+        let errorMessage;
+
         return new Promise((resolve, reject) => {
+
             prc.stdout.on('data', (data) => {
                 if (execState !== 'FAILED') {
                     if (response) {
@@ -85,22 +89,8 @@ class Controller {
 
             prc.stderr.on('data', (data) => {
                 console.error(`${this.sysdigPath}/${exe}`, args, 'error read from STDERR', data);
-
-                if (execState !== 'FAILED') {
-                    const message = { reason: data };
-
-                    if (response) {
-                        response.status(500);
-
-                        if (execState === 'STARTED') {
-                            response.send(JSON.stringify(message));
-                        }
-                    }
-
-                    execState = 'FAILED';
-
-                    reject(message);
-                }
+                stderrPresent = true;
+                errorMessage = {reason: data};
             });
 
             prc.on('error', (err) => {
@@ -135,7 +125,12 @@ class Controller {
                         response.end();
                     } else if (execState === 'STARTED') {
                         // Send 'no content' if nothing happened
-                        response.status(204).send();
+                        if(stderrPresent) {
+                        	response.status(500);
+                        	response.send(JSON.stringify(errorMessage));
+                        } else {
+                        	response.status(204).send();
+                        }
                     }
                 }
 
@@ -143,8 +138,12 @@ class Controller {
                     if (code === 0) {
                         resolve({code});
                     } else {
-                        const message = { reason: 'Unexpected exit', details: code };
-                        reject(message);
+                       if(stderrPresent) {
+                       	reject(errorMessage);
+                       } else {
+                       	const message = { reason: 'Unexpected exit', details: code };
+                       	reject(message);
+                       }
                     }
                 }
 
diff --git a/package.json b/package.json
index a318186b..500c23a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sysdig-inspect",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Sysdig Inspect",
   "repository": {
     "type": "git",