Restoring ErrorHandler / ErrorPageErrorHandler logic