diff --git a/Jenkinsfile b/Jenkinsfile
index a4877e5443337c14423be9902e16a25ef8cf13c6..a5d28f3685b95c995c498397d11a0a2a7120ce37 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -166,7 +166,7 @@ pipeline {
                             
 							shutdownEnvironment(namespace)
 
-                            if(testResult != "0") {
+                            if(!testResult) {
 				            	E2E_FAILED += "${stageName}, "
                                 error("Fehler in Stage ${stageName}")
             				}
@@ -206,7 +206,7 @@ pipeline {
                             
    							shutdownEnvironment(namespace)
 
-							if(testResult != "0") {
+							if(!testResult) {
 				            	E2E_FAILED += "${stageName}, "
                                 error("Fehler in Stage ${stageName}")
             				}
@@ -370,10 +370,16 @@ Void startGoofy(String namespace, String values, String imageTag) {
 
 String runTests(String stageName, String reportFolder) {
 	container("cypress") {
-    	def configFile = generateCypressConfig(stageName, reportFolder)
-        dir("goofy-client") {
-        	sh "npm run cypress:version"
-            return sh (script: "npm run cypress:ci-run --CONFIG_FILE=${configFile} --REPORT_FOLDER=${reportFolder}", returnStatus: true)
+        try {
+    	    def configFile = generateCypressConfig(stageName, reportFolder)
+            dir("goofy-client") {
+        	    sh "npm run cypress:version"
+                sh "npm run cypress:ci-run --CONFIG_FILE=${configFile} --REPORT_FOLDER=${reportFolder}"
+
+                return true
+            }
+        } catch (Exception e) {
+            return false
         }
     }
 }