Better error handling in scheduler job
Merge pull request #429 from emmanuel-keller/1.5

Better error handling in scheduler job