Merge "Trap ERR exit to help with CI logs"