diff --git a/script/addons/coverage_install_addons_restore_dev.sh b/script/addons/coverage_install_addons_restore_dev.sh
index 8651a73..93cfb31 100755
--- a/script/addons/coverage_install_addons_restore_dev.sh
+++ b/script/addons/coverage_install_addons_restore_dev.sh
@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 # "$1" code_generator_name
 ./script/database/db_restore.py --database "$1"
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error ./script/database/db_restore.py into coverage_install_addons_restore_dev.sh"
   exit 1
 fi
 
 ./script/addons/coverage_install_addons_dev.sh "$1" "$1"
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error ./script/addons/coverage_install_addons_dev.sh into coverage_install_addons_restore_dev.sh"
   exit 1
diff --git a/script/addons/install_addons_from_file.sh b/script/addons/install_addons_from_file.sh
index 32cfa45..6c347e4 100755
--- a/script/addons/install_addons_from_file.sh
+++ b/script/addons/install_addons_from_file.sh
@@ -2,6 +2,7 @@
 # $1 BD NAME
 # $2 file_path
 ./script/addons/install_addons.sh "$1" "$(<$2)"
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error ./script/addons/install_addons.sh  into install_addons_from_file.sh"
   exit 1
diff --git a/script/addons/install_addons_restore_dev.sh b/script/addons/install_addons_restore_dev.sh
index ddf4e46..1d51b44 100755
--- a/script/addons/install_addons_restore_dev.sh
+++ b/script/addons/install_addons_restore_dev.sh
@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 # "$1" code_generator_name
 ./script/database/db_restore.py --database "$1"
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error ./script/database/db_restore.py into install_addons_restore_dev.sh"
   exit 1
 fi
 
 ./script/addons/install_addons_dev.sh "$1" "$1"
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error ./script/addons/install_addons_dev.sh into install_addons_restore_dev.sh"
   exit 1
diff --git a/script/install/install_locally_dev.sh b/script/install/install_locally_dev.sh
index 2f4cc91..bfe9f12 100755
--- a/script/install/install_locally_dev.sh
+++ b/script/install/install_locally_dev.sh
@@ -11,13 +11,14 @@ fi
 
 # Update git-repo
 ./script/manifest/update_manifest_local_dev.sh
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
     echo "Error manifest update, check git-repo."
     exit 1
 fi
 
 # Install maintainer-tools
-cd script/OCA_maintainer-tools
+cd script/OCA_maintainer-tools || exit
 # virtualenv is not installed by default
 #virtualenv env
 ../../.venv/bin/python -m venv env
diff --git a/script/install/install_locally_prod.sh b/script/install/install_locally_prod.sh
index d220a77..2d23e59 100755
--- a/script/install/install_locally_prod.sh
+++ b/script/install/install_locally_prod.sh
@@ -11,6 +11,7 @@ fi
 
 # Update git-repo
 ./script/manifest/update_manifest_prod.sh
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
     echo "Error manifest update, check git-repo."
     exit 1