Improve the display of any 1st run error messages
Merge pull request #830 from graeme-f/master

Improve the display of any 1st run error messages