diff --git a/apps/compiler/compiler.sh b/apps/compiler/compiler.sh
index 388ad41a3..168323ea4 100755
--- a/apps/compiler/compiler.sh
+++ b/apps/compiler/compiler.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/includes/includes.sh"
diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh
index 92d2d7bdc..e0f5560b1 100644
--- a/apps/compiler/includes/functions.sh
+++ b/apps/compiler/includes/functions.sh
@@ -6,8 +6,8 @@ function comp_clean() {
 
   cd $BUILDPATH
 
-  make -f Makefile clean
-  make clean
+  make -f Makefile clean || true
+  make clean || true
   find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
 
   cd $CWD
@@ -69,4 +69,4 @@ function comp_build() {
 function comp_all() {
     comp_clean
     comp_build
-}
\ No newline at end of file
+}
diff --git a/apps/db_assembler/db_assembler.sh b/apps/db_assembler/db_assembler.sh
index e1e1de240..eaa6b1678 100644
--- a/apps/db_assembler/db_assembler.sh
+++ b/apps/db_assembler/db_assembler.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/includes/includes.sh"