Merge pull request #3160 from dandsager1/STORM-3530

STORM-3530 Improve scheduling failure messages