Add error handling for email to prevent failing of jobs
Tweaks to jobs processing