trying to avoid possible set -e violations, update #3044