Revert "remove NULL check, replace with DummyLayout"
Revert "remove NULL check, replace with DummyLayout"

This reverts commit ce03278d842a0ff6325f6041e4c95dee0bfd74c6.

rikmeijer/teach.php,rikmeijer/teach.php,pulledbits/router,rikmeijer/teach.php