Refactor to support 30x behaviour and not try to evaluate on a null page.