diff --git a/src/Controller/Adminhtml/Page/Save.php b/src/Controller/Adminhtml/Page/Save.php
index b050231..064d5a2 100644
--- a/src/Controller/Adminhtml/Page/Save.php
+++ b/src/Controller/Adminhtml/Page/Save.php
@@ -121,6 +121,7 @@ protected function hydrateLandingPage(LandingPageInterface $landingPage, array $
             unset($data[LandingPageInterface::OVERVIEW_PAGE_IMAGE]);
         }
         $this->dataObjectHelper->populateWithArray($landingPage, $data, LandingPageInterface::class);
-        $landingPage->setFilterAttributes(serialize($data[LandingPageInterface::FILTER_ATTRIBUTES]));
+        $filterAttributes = $data[LandingPageInterface::FILTER_ATTRIBUTES] ?? [];
+        $landingPage->setFilterAttributes(serialize($filterAttributes));
     }
 }
diff --git a/src/Model/UrlRewriteService.php b/src/Model/UrlRewriteService.php
index 0d0650f..b22c72c 100644
--- a/src/Model/UrlRewriteService.php
+++ b/src/Model/UrlRewriteService.php
@@ -109,10 +109,10 @@ static function (UrlRewrite $rewrite) {
     }
 
     /**
-     * @param LandingPage $page
+     * @param UrlRewriteGeneratorInterface $page
      * @param string|null $suffix
      */
-    public function generateRewrite(LandingPage $page, string $suffix = null)
+    public function generateRewrite(UrlRewriteGeneratorInterface $page, string $suffix = null)
     {
         $urlRewritesToPersist = [];