This should make it safe to restore 'set -e'