Merge "Cleanup error handling in jobs." into nyc-dev