fix showing error pages.
merge commit