Merge pull request #133 from skweeker/master

Improving error message displays