Added error pages.
Merge.
Merge branch 'errors'
Wire up error pages