diff --git a/crowsnest b/crowsnest
index 33de87a..1454fa0 100755
--- a/crowsnest
+++ b/crowsnest
@@ -14,10 +14,8 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
-CN_DEBUG_ERR_EXIT=""
-export CN_DEBUG_ERR_EXIT
 # Base Path
 BASE_CN_PATH="$(dirname "$(readlink -f "${0}")")"
 
diff --git a/libs/camera-streamer.sh b/libs/camera-streamer.sh
index 5336be6..885557d 100755
--- a/libs/camera-streamer.sh
+++ b/libs/camera-streamer.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 function run_multi() {
     local cams
diff --git a/libs/configparser.sh b/libs/configparser.sh
index 0da207c..60acb80 100755
--- a/libs/configparser.sh
+++ b/libs/configparser.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 # Read Configuration File
 # call get_param section param
diff --git a/libs/core.sh b/libs/core.sh
index 1e0c024..2415dda 100755
--- a/libs/core.sh
+++ b/libs/core.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 ## Version of crowsnest
 function self_version {
diff --git a/libs/hwhandler.sh b/libs/hwhandler.sh
index 59224a9..543a6d4 100755
--- a/libs/hwhandler.sh
+++ b/libs/hwhandler.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 ### Detect Hardware
 detect_avail_cams() {
diff --git a/libs/init_stream.sh b/libs/init_stream.sh
index dd9d38d..40edd19 100755
--- a/libs/init_stream.sh
+++ b/libs/init_stream.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 ## Start Stream Service
 # sleep to prevent cpu cycle spikes
diff --git a/libs/logging.sh b/libs/logging.sh
index 66cbfd6..43a38ce 100755
--- a/libs/logging.sh
+++ b/libs/logging.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 ## Logging
 function set_log_path {
diff --git a/libs/messages.sh b/libs/messages.sh
index a080bf3..90eedb0 100755
--- a/libs/messages.sh
+++ b/libs/messages.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 ## Message Helpers
 
diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh
index 50b4001..aa0140e 100755
--- a/libs/ustreamer.sh
+++ b/libs/ustreamer.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 run_mjpg() {
     local cams
diff --git a/libs/v4l2_control.sh b/libs/v4l2_control.sh
index 1e11bb1..15ddecb 100755
--- a/libs/v4l2_control.sh
+++ b/libs/v4l2_control.sh
@@ -16,7 +16,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 function v4l2_control {
     v4c_log_msg() {
diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh
index e1eba99..806bf12 100644
--- a/libs/versioncontrol.sh
+++ b/libs/versioncontrol.sh
@@ -16,7 +16,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 versioncontrol() {
 
diff --git a/libs/watchdog.sh b/libs/watchdog.sh
index b1a38a3..f535c75 100755
--- a/libs/watchdog.sh
+++ b/libs/watchdog.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -Eeou
+set -Ee
 
 #### Watchdog Functions and Variables
 ## Do not reuse functions from other libs/scripts!