diff --git a/hooks/containerbuild/debian/install-build-essential b/hooks/containerbuild/debian/install-build-essential
index ed0cbfb..9dcc1de 100755
--- a/hooks/containerbuild/debian/install-build-essential
+++ b/hooks/containerbuild/debian/install-build-essential
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 ${TAMARIN_ACBUILD} environment add DEBIAN_FRONTEND noninteractive
 
 if [ "${TAMARIN_ACBUILD_ENGINE}" == 'chroot' ]; then
diff --git a/hooks/containerbuild/debian/install-git b/hooks/containerbuild/debian/install-git
index 4e5c7fe..a2a2733 100755
--- a/hooks/containerbuild/debian/install-git
+++ b/hooks/containerbuild/debian/install-git
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 ${TAMARIN_ACBUILD} environment add DEBIAN_FRONTEND noninteractive
 sudo -E /usr/bin/env bash - <<EOF
 export PATH=${PATH}
diff --git a/lib/rkt.py b/lib/rkt.py
index 37d9fa1..4e8254b 100644
--- a/lib/rkt.py
+++ b/lib/rkt.py
@@ -9,7 +9,7 @@ def run(args, as_root = False, capture_output=False, debug=False):
     if capture_output:
         return subprocess.check_output(cmd, stdin=subprocess.PIPE)
     else:
-        return subprocess.call(cmd, stdin=subprocess.PIPE)
+        return subprocess.check_call(cmd, stdin=subprocess.PIPE)
 
 def get_images_list(rkt_flags = [], debug=False):
     output = run([
diff --git a/lib/tamarin.py b/lib/tamarin.py
index 95891c1..fcb27cd 100644
--- a/lib/tamarin.py
+++ b/lib/tamarin.py
@@ -12,9 +12,7 @@ def run_profile_hooks(profile, step, cwd=None, env=None, debug=False):
     if not trimmed_hook_name:
       continue
     hook_path = os.path.join(hooks_dir, trimmed_hook_name)
-    code = subprocess.call(hook_path, cwd=cwd, stdin=subprocess.PIPE, env=env)
-    if code != 0:
-      raise Exception("Hook '{:s}' exited with a non zero code ({:d}) !".format(trimmed_hook_name, code))
+    code = subprocess.check_call(hook_path, cwd=cwd, stdin=subprocess.PIPE, env=env)
 
 def get_hooks_dir():
   return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../hooks")
@@ -86,4 +84,4 @@ def run_acbuild(args, captureOutput=False, as_root=False, debug=False):
     if captureOutput:
         return subprocess.check_output(cmd, stdin=subprocess.PIPE)
     else:
-        return subprocess.call(cmd, stdin=subprocess.PIPE)
+        return subprocess.check_call(cmd, stdin=subprocess.PIPE)