diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php
index 842cff1f1..17f42e9a5 100644
--- a/modules/backend/traits/FormModelSaver.php
+++ b/modules/backend/traits/FormModelSaver.php
@@ -28,8 +28,6 @@ trait FormModelSaver
      *
      *     $modelsToSave = $this->prepareModelsToSave($model, [...]);
      *
-     *     $test = 'cms.theme.getActiveTheme';
-     *
      *     foreach ($modelsToSave as $modelToSave) {
      *         $modelToSave->save();
      *     }
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index 282a50c28..b598d9e2d 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -5,7 +5,7 @@ use View;
 use Config;
 use Cms\Classes\Theme;
 use Cms\Classes\Router;
-use Cms\Classes\Controller;
+use Cms\Classes\Controller as CmsController;
 use October\Rain\Exception\ErrorHandler as ErrorHandlerBase;
 use October\Rain\Exception\ApplicationException;
 
@@ -66,7 +66,7 @@ class ErrorHandler extends ErrorHandlerBase
         }
 
         // Route to the CMS error page.
-        $controller = new Controller($theme);
+        $controller = new CmsController($theme);
         $result = $controller->run('/error');
 
         // Extract content from response object