@vieux there are other instances in this codeblock where `job.Error` is not returned, should they also be updated?