diff --git a/libs/configparser.sh b/libs/configparser.sh
index f1a9bec..6d8a85e 100755
--- a/libs/configparser.sh
+++ b/libs/configparser.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 # Read Configuration File
 # call get_param section param
diff --git a/libs/core.sh b/libs/core.sh
index bd7f391..695fc5f 100755
--- a/libs/core.sh
+++ b/libs/core.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 ## Version of webcamd
 function self_version {
diff --git a/libs/init_stream.sh b/libs/init_stream.sh
index 3dbfc31..0bc3ed1 100755
--- a/libs/init_stream.sh
+++ b/libs/init_stream.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 ## Start Stream Service
 # sleep to prevent cpu cycle spikes
diff --git a/libs/messages.sh b/libs/messages.sh
index 2e40dd3..d650c81 100755
--- a/libs/messages.sh
+++ b/libs/messages.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 ## Message Helpers
 
diff --git a/libs/rtspsimple.sh b/libs/rtspsimple.sh
index b89aec6..1dc15d1 100755
--- a/libs/rtspsimple.sh
+++ b/libs/rtspsimple.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 function run_rtsp {
     local cams
diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh
index 12682d2..cb539b3 100755
--- a/libs/ustreamer.sh
+++ b/libs/ustreamer.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 function run_mjpg {
     local cams
diff --git a/libs/watchdog.sh b/libs/watchdog.sh
index 33b9b16..6470cdf 100755
--- a/libs/watchdog.sh
+++ b/libs/watchdog.sh
@@ -14,7 +14,7 @@
 # shellcheck enable=require-variable-braces
 
 # Exit upon Errors
-set -e
+set -Ee
 
 #### Watchdog Functions and Variables
 ## Do not reuse functions from other libs/scripts!
diff --git a/tools/install.sh b/tools/install.sh
index 6051772..75be5c1 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -11,7 +11,7 @@
 
 ## disabeld SC2086 for some lines because there we want 'word splitting'
 
-set -e
+set -Ee
 
 ## Debug
 # set -x
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 251e6b2..aadc4ff 100755
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -11,7 +11,7 @@
 # shellcheck enable=require-variable-braces
 
 ## Exit on Error
-set -e
+set -Ee
 
 ## Debug
 # set -x