FIX return 404 instead of 500 for invalid model class, fixes #570

silverstripe · May 28, 2024 · 5493a28 · 5493a28
1 parent 65c0adb
commit 5493a28
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\Admin;
 
 use InvalidArgumentException;
+use Psr\Log\LoggerInterface;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
@@ -162,7 +163,8 @@ protected function init()
             $this->modelTab = $this->unsanitiseClassName($this->modelTab);
 
             if (!$this->isManagedModel($this->modelTab)) {
-                throw new \RuntimeException(sprintf('ModelAdmin::init(): Invalid Model class %s', $this->modelTab));
+                Injector::inst()->get(LoggerInterface::class)->error(sprintf('ModelAdmin::init(): Invalid Model class %s', $this->modelTab));
+                return $this->httpError(404, 'Page not found');
             }
         }