More fixes for set -e.
Better fix of set -e problem.