Merge error page changes.