diff --git a/tools/copy-common-files.sh b/tools/copy-common-files.sh
index 83da91b91..56fb20ab3 100644
--- a/tools/copy-common-files.sh
+++ b/tools/copy-common-files.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 DES=$1
 
 bash ./tools/make-assets.sh        $DES
diff --git a/tools/import-crowdin.sh b/tools/import-crowdin.sh
index 808eb7e78..7ca97752d 100755
--- a/tools/import-crowdin.sh
+++ b/tools/import-crowdin.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock: Importing from Crowdin archive"
 
 SRC=~/Downloads/crowdin
diff --git a/tools/make-assets.sh b/tools/make-assets.sh
index 1c1188abf..3850f353a 100755
--- a/tools/make-assets.sh
+++ b/tools/make-assets.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 DES=$1/assets
 
 echo "*** Packaging assets in $DES... "
diff --git a/tools/make-browser.sh b/tools/make-browser.sh
index 3df4fdf67..2b716a860 100755
--- a/tools/make-browser.sh
+++ b/tools/make-browser.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 DES=dist/build/uBlock0.browser
 
 mkdir -p $DES/js
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index 047146026..cd901f3eb 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock0.chromium: Creating web store package"
 
 DES=dist/build/uBlock0.chromium
diff --git a/tools/make-clean.sh b/tools/make-clean.sh
index 6dc60fe2e..6935eefe2 100755
--- a/tools/make-clean.sh
+++ b/tools/make-clean.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock: Cleaning."
-rm -R dist/build
+rm -Rf dist/build
 echo "*** uBlock: Cleaned."
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index b50eae886..121b9f00b 100755
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock0.firefox: Creating web store package"
 
 BLDIR=dist/build
diff --git a/tools/make-nodejs.sh b/tools/make-nodejs.sh
index 88778adad..9404d2c2d 100755
--- a/tools/make-nodejs.sh
+++ b/tools/make-nodejs.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 DES=dist/build/uBlock0.nodejs
 
 mkdir -p $DES/js
diff --git a/tools/make-opera.sh b/tools/make-opera.sh
index 0e95e1a41..111edba62 100755
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock0.opera: Creating web store package"
 
 DES=dist/build/uBlock0.opera
diff --git a/tools/make-thunderbird.sh b/tools/make-thunderbird.sh
index 590a2bce9..07096a160 100755
--- a/tools/make-thunderbird.sh
+++ b/tools/make-thunderbird.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** uBlock0.thunderbird: Creating web store package"
 
 BLDIR=dist/build
diff --git a/tools/update-submodules.sh b/tools/update-submodules.sh
index 3391f21ab..09ac0a232 100755
--- a/tools/update-submodules.sh
+++ b/tools/update-submodules.sh
@@ -2,6 +2,8 @@
 #
 # This script assumes a linux environment
 
+set -e
+
 echo "*** Update submodules"
 
 git submodule update --remote