Correct broken error pages.
Merge remote-tracking branch 'origin/next'