Simplify the way errors are displayed.
Merge pull request #21 from ngodfraind/master

Simplify the way errors are displayed.