Make it actually work as intended

(overuse of set -e considered harmful)