fixing error pages.
Merge branch 'mailer' into develop