Updated for error page changes