Cleanup messy error messages
Merge pull request #4839

346193b Cleanup messy error messages (R E Broadley)