Added more stuff to JobData, updated error handling in JobHandler