diff --git a/classes/Block.php b/classes/Block.php
index 158318c..833f7ab 100644
--- a/classes/Block.php
+++ b/classes/Block.php
@@ -7,6 +7,8 @@
 use Cms\Classes\CodeParser;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\Controller;
+use Cms\Classes\Layout;
+use Cms\Classes\Page;
 use Cms\Classes\PartialStack;
 use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Exception\SystemException;
@@ -173,7 +175,11 @@ public function executeLifecycle(Controller $controller): static
 
         CmsException::mask($this->page, 300);
         $parser = new CodeParser($this);
-        $partialObj = $parser->source($controller->getPage(), $controller->getLayout(), $controller);
+        $partialObj = $parser->source(
+            $controller->getPage() ?: new Page(),
+            $controller->getLayout() ?: new Layout(),
+            $controller
+        );
         CmsException::unmask();
 
         CmsException::mask($this, 300);