diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 03b59e408..bc64d5868 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -325,7 +325,7 @@ class Controller extends Extendable
                  * Execute the handler
                  */
                 if (!$result = $this->runAjaxHandler($handler))
-                    throw new SystemException(Lang::get('cms::lang.ajax_handler.not_found', ['name'=>$handler]));
+                    throw new ApplicationException(Lang::get('cms::lang.ajax_handler.not_found', ['name'=>$handler]));
 
                 /*
                  * If the handler returned an array, we should add it to output for rendering.
diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index 559ab3bb1..8225d10b4 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -75,7 +75,7 @@ abstract class ComponentBase extends Extendable
     /**
      * @var array Cache of linked Component objects, used for page links.
      */
-    protected $pageLinkCache = [];
+    // protected $pageLinkCache = [];
 
     /**
      * Component constructor. Takes in the page or layout code section object