diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
index b379837b49..03586d9664 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
@@ -54,6 +54,7 @@ import sonia.scm.plugin.ext.Extension;
 import sonia.scm.plugin.ext.ExtensionBinder;
 import sonia.scm.plugin.ext.ExtensionProcessor;
 import sonia.scm.plugin.ext.Extensions;
+import sonia.scm.util.ClassLoaders;
 import sonia.scm.util.IOUtil;
 import sonia.scm.web.security.DefaultAuthenticationHandler;
 
@@ -123,7 +124,8 @@ public class DefaultPluginLoader implements PluginLoader
     this.servletContext = servletContext;
     this.annotationScannerFactory = new DefaultAnnotationScannerFactory();
 
-    ClassLoader classLoader = getClassLoader();
+    ClassLoader classLoader =
+      ClassLoaders.getContextClassLoader(DefaultPluginLoader.class);
 
     try
     {
@@ -502,7 +504,8 @@ public class DefaultPluginLoader implements PluginLoader
    */
   private void scanForAnnotations()
   {
-    ClassLoader classLoader = getClassLoader();
+    ClassLoader classLoader =
+      ClassLoaders.getContextClassLoader(DefaultPluginLoader.class);
 
     AnnotationCollector<ExtensionPoint> extensionPointCollector =
       new AnnotationCollector<ExtensionPoint>();
@@ -610,31 +613,6 @@ public class DefaultPluginLoader implements PluginLoader
     }
   }
 
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * TODO create util method
-   *
-   *
-   * @return
-   */
-  private ClassLoader getClassLoader()
-  {
-    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
-    if (classLoader == null)
-    {
-      if (logger.isWarnEnabled())
-      {
-        logger.warn("could not use context classloader, try to use default");
-      }
-
-      classLoader = DefaultPluginManager.class.getClassLoader();
-    }
-
-    return classLoader;
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */