Prepared for new exception pages