diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
index d17a693969..55b5dd9328 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
@@ -614,17 +614,6 @@ public class DefaultPluginManager implements PluginManager
             center.setPlugins(pluginInformationSet);
             preparePlugins(center);
             cache.put(PluginCenter.class.getName(), center);
-
-            /*
-             * if (pluginHandler == null)
-             * {
-             * pluginHandler = new AetherPluginHandler(this,
-             *   SCMContext.getContext(), configuration,
-             *   advancedPluginConfiguration);
-             * }
-             *
-             * pluginHandler.setPluginRepositories(center.getRepositories());
-             */
           }
           catch (IOException ex)
           {
@@ -632,6 +621,9 @@ public class DefaultPluginManager implements PluginManager
           }
         }
       }
+      if(center == null) {
+        center = new PluginCenter();
+      }
     }
 
     return center;