improve error handling on mass email jobs, RT#8720