Improve pre error handling

NB this is so we can put things in LOGFILE at earlier points
than the script does at present

We capture the error code at a few points in the script, and then (intend to)
log something about what went wrong. But if we set -e we immediately bail
before logging anything useful!