Add "set -e" in a few places.