1734 - Made error messages more friendly

Fixes #1734