Improve error pages
Merge pull request #78 from erengy/error-pages

Improve error pages