Fix nasty, nasty, set -e bug