Cleanup error handling in jobs.

Change-Id: Icf6a7aad1b84dc92285064810776239e93494e38
6 files changed