Better job handling errors