diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index d2387763e9..958c93be38 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -330,7 +330,9 @@ class Application extends SilexApplication
     public function loadPlugins()
     {
         call_user_func(function ($app) {
-            require $app['plugin.path'] . '/services.php';
+            if (file_exists($app['plugin.path'] . '/services.php')) {
+                require $app['plugin.path'] . '/services.php';
+            }
         }, $this);
     }
 
@@ -385,7 +387,10 @@ class Application extends SilexApplication
             $this->extend('twig', function (\Twig_Environment $twig, $app) {
                 $twig->setCache($app['cache.path'].'/twig');
 
-                $paths = require $app['plugin.path'] . '/twig-paths.php';
+                $paths = [];
+                if (file_exists($app['plugin.path'] . '/twig-paths.php')) {
+                    $paths = require $app['plugin.path'] . '/twig-paths.php';
+                }
 
                 if ($app['browser']->isTablet() || $app['browser']->isMobile()) {
                     $paths[] = $app['root.path'] . '/config/templates/mobile';
diff --git a/lib/autoload.php b/lib/autoload.php
index b62f6f9c5c..9e323d2a2e 100644
--- a/lib/autoload.php
+++ b/lib/autoload.php
@@ -1,3 +1,6 @@
 <?php
 
-return require __DIR__ . '/../plugins/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
+if (file_exists(__DIR__ . '/../plugins/autoload.php')) {
+    require __DIR__ . '/../plugins/autoload.php';
+}