diff --git a/ChangeLog b/ChangeLog
index 3fb079624..76954c0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 Version 1.0.21 (unreleased)
 ---------------------------
 
+Improvements:
+
+* Improve error handling of plugins
+
 Bug fixes:
 
 * Loading cs_CZ locale display the wrong language in datetime picker
diff --git a/app/Core/Plugin/Loader.php b/app/Core/Plugin/Loader.php
index 4769e5cb3..530d9b404 100644
--- a/app/Core/Plugin/Loader.php
+++ b/app/Core/Plugin/Loader.php
@@ -4,6 +4,7 @@ namespace Kanboard\Core\Plugin;
 
 use DirectoryIterator;
 use PDOException;
+use LogicException;
 use RuntimeException;
 use Kanboard\Core\Tool;
 
@@ -59,6 +60,11 @@ class Loader extends \Kanboard\Core\Base
     public function load($plugin)
     {
         $class = '\Kanboard\Plugin\\'.$plugin.'\\Plugin';
+
+        if (! class_exists($class)) {
+            throw new LogicException('Unable to load this plugin class '.$class);
+        }
+
         $instance = new $class($this->container);
 
         Tool::buildDic($this->container, $instance->getClasses());