diff --git a/makepkg-overlay b/makepkg-overlay
index 24b5323..edf178c 100755
--- a/makepkg-overlay
+++ b/makepkg-overlay
@@ -37,7 +37,7 @@ cnt="_makepkg.$$"
 cnt_dir="$wrk_dir/containers/$cnt"
 
 # Create new container
-lxf -r builder -i base new "$cnt"
+lxf -r builder -i base new "$cnt" || exit $?
 
 # Unmount the thing in any case
 trap 'cleanup' INT TERM EXIT
@@ -47,8 +47,7 @@ buildscript > "$cnt_dir/rootfs/init"
 chmod 755 "$cnt_dir/rootfs/init"
 
 # Start the container
-lxc-start -n "$cnt" -F /init; lxc_exit=$?
-(( lxc_exit )) && exit "$lxc_exit"
+lxc-start -n "$cnt" -F /init || exit $?
 
 # Put the artifacts where asked to
 [[ "$pkg_dest" ]] && {