more friendly error messages part 1
Merge pull request #701 from RoanKanninga/master

more friendly error messages part 1