diff --git a/inc/load.php b/inc/load.php
index 9f54034a38bdb778a1a18800c90b436b32b25d70..7a410e452d94e3cdef0ca52267549c82c0d48097 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -96,11 +96,12 @@ function load_autoload($name){
     // Plugin loading
     if(preg_match('/^(helper|syntax|action|admin|renderer|remote)_plugin_([^_]+)(?:_([^_]+))?$/',
                   $name, $m)) {
-                //try to load the wanted plugin file
-        // include, but be silent. Maybe some other autoloader has an idea
-        // how to load this class.
+        // try to load the wanted plugin file
         $c = ((count($m) === 4) ? "/{$m[3]}" : '');
-        @include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        $plg = DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        if(@file_exists($plg)){
+            include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        }
         return;
     }
 }
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 208d7dae958d3a80391958a9eeca8752f0cef64c..11636fb9155cdb89ae0b5dad0db85c50a7a8bae3 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -169,7 +169,7 @@ class Doku_Plugin_Controller {
         $plugins = array();
         foreach($files as $file) {
             if(file_exists($file)) {
-                @include_once($file);
+                include_once($file);
             }
         }
         return $plugins;