Better errer pages (#1026)
Merge pull request #1028 from pculture/gh-1026

Better errer pages (#1026)