try without set -e and hope I'm lucky - refs #535