Added support for error-page manipulation