diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index bb6728607eb8..feb8ad8a8662 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -27,10 +27,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.extensions.LogProvider;
 import com.intellij.openapi.extensions.PluginId;
-import com.intellij.openapi.util.BuildNumber;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.JDOMUtil;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
@@ -52,7 +49,10 @@ import org.jetbrains.annotations.Nullable;
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -93,27 +93,19 @@ public class PluginManagerCore {
   public static void loadDisabledPlugins(final String configPath, final Collection<String> disabledPlugins) {
     final File file = new File(configPath, DISABLED_PLUGINS_FILENAME);
     if (file.isFile()) {
-      BufferedReader reader = null;
       try {
-        reader = new BufferedReader(new FileReader(file));
-        String id;
-        while ((id = reader.readLine()) != null) {
-          disabledPlugins.add(id.trim());
-        }
-      }
-      catch (IOException e) {
-        //do nothing
-      }
-      finally {
+        BufferedReader reader = new BufferedReader(new FileReader(file));
         try {
-          if (reader != null) {
-            reader.close();
+          String id;
+          while ((id = reader.readLine()) != null) {
+            disabledPlugins.add(id.trim());
           }
         }
-        catch (IOException e) {
-          //do nothing
+        finally {
+          reader.close();
         }
       }
+      catch (IOException ignored) { }
     }
   }
 
@@ -137,18 +129,15 @@ public class PluginManagerCore {
     if (!plugins.isFile()) {
       FileUtil.ensureCanCreateFile(plugins);
     }
-    PrintWriter printWriter = null;
+    PrintWriter printWriter = new PrintWriter(new BufferedWriter(new FileWriter(plugins, append)));
     try {
-      printWriter = new PrintWriter(new BufferedWriter(new FileWriter(plugins, append)));
       for (String id : ids) {
         printWriter.println(id);
       }
       printWriter.flush();
     }
     finally {
-      if (printWriter != null) {
-        printWriter.close();
-      }
+      printWriter.close();
     }
   }
 
@@ -233,7 +222,7 @@ public class PluginManagerCore {
                              Map<PluginId, IdeaPluginDescriptor> map,
                              final boolean checkModuleDependencies) {
     for (PluginId id: descriptor.getDependentPluginIds()) {
-      if (ArrayUtil.contains(id, descriptor.getOptionalDependentPluginIds())) {
+      if (ArrayUtil.contains(id, (Object[])descriptor.getOptionalDependentPluginIds())) {
         continue;
       }
       if (!checkModuleDependencies && isModuleDependency(id)) {
@@ -412,19 +401,16 @@ public class PluginManagerCore {
     return 0;
   }
 
-  @SuppressWarnings({"EmptyCatchBlock"})
   static Collection<URL> getClassLoaderUrls() {
     final ClassLoader classLoader = PluginManagerCore.class.getClassLoader();
     final Class<? extends ClassLoader> aClass = classLoader.getClass();
     try {
-      return (List<URL>)aClass.getMethod("getUrls").invoke(classLoader);
-    }
-    catch (IllegalAccessException e) {
-    }
-    catch (InvocationTargetException e) {
-    }
-    catch (NoSuchMethodException e) {
+      @SuppressWarnings("unchecked") List<URL> urls = (List<URL>)aClass.getMethod("getUrls").invoke(classLoader);
+      return urls;
     }
+    catch (IllegalAccessException ignored) { }
+    catch (InvocationTargetException ignored) { }
+    catch (NoSuchMethodException ignored) { }
 
     if (classLoader instanceof URLClassLoader) {
       return Arrays.asList(((URLClassLoader)classLoader).getURLs());
@@ -448,10 +434,10 @@ public class PluginManagerCore {
     }
   }
 
-  static <T extends IdeaPluginDescriptor> void addModulesAsDependents(final Map<PluginId, T> map) {
+  private static void addModulesAsDependents(Map<PluginId, ? super IdeaPluginDescriptorImpl> map) {
     for (String module : ourAvailableModules) {
       // fake plugin descriptors to satisfy dependencies
-      map.put(PluginId.getId(module), (T) new IdeaPluginDescriptorImpl());
+      map.put(PluginId.getId(module), new IdeaPluginDescriptorImpl());
     }
   }
 
@@ -648,7 +634,7 @@ public class PluginManagerCore {
         if (optionalDescriptor == null && !FileUtil.isJarOrZip(file)) {
           for (URL url : getClassLoaderUrls()) {
             if ("file".equals(url.getProtocol())) {
-              optionalDescriptor = loadDescriptor(new File(URLDecoder.decode(url.getFile())), optionalDescriptorName);
+              optionalDescriptor = loadDescriptor(new File(url.getFile()), optionalDescriptorName);
               if (optionalDescriptor != null) {
                 break;
               }
@@ -795,51 +781,40 @@ public class PluginManagerCore {
     return null;
   }
 
-  @SuppressWarnings({"UseOfSystemOutOrSystemErr", "CallToPrintStackTrace"})
-  static void loadDescriptorsFromClassPath(final List<IdeaPluginDescriptorImpl> result, @Nullable StartupProgress progress) {
-    try {
-      final Collection<URL> urls = getClassLoaderUrls();
-      final String platformPrefix = System.getProperty(PlatformUtilsCore.PLATFORM_PREFIX_KEY);
-      int i = 0;
-      for (URL url : urls) {
-        i++;
-        final String protocol = url.getProtocol();
-        if ("file".equals(protocol)) {
-          final File file = new File(URLDecoder.decode(url.getFile()));
-          //final String canonicalPath = file.getCanonicalPath();
-          //if (!canonicalPath.startsWith(homePath) || canonicalPath.endsWith(".jar")) continue;
-          //if (!canonicalPath.startsWith(homePath)) continue;
+  static void loadDescriptorsFromClassPath(@NotNull List<IdeaPluginDescriptorImpl> result, @Nullable StartupProgress progress) {
+    Collection<URL> urls = getClassLoaderUrls();
+    String platformPrefix = System.getProperty(PlatformUtilsCore.PLATFORM_PREFIX_KEY);
+    int i = 0;
+    for (URL url : urls) {
+      i++;
+      if ("file".equals(url.getProtocol())) {
+        File file = new File(url.getFile());
 
-          IdeaPluginDescriptorImpl platformPluginDescriptor = null;
-          if (platformPrefix != null) {
-            platformPluginDescriptor = loadDescriptor(file, platformPrefix + "Plugin.xml");
-            if (platformPluginDescriptor != null && !result.contains(platformPluginDescriptor)) {
-              platformPluginDescriptor.setUseCoreClassLoader(true);
-              result.add(platformPluginDescriptor);
-            }
+        IdeaPluginDescriptorImpl platformPluginDescriptor = null;
+        if (platformPrefix != null) {
+          platformPluginDescriptor = loadDescriptor(file, platformPrefix + "Plugin.xml");
+          if (platformPluginDescriptor != null && !result.contains(platformPluginDescriptor)) {
+            platformPluginDescriptor.setUseCoreClassLoader(true);
+            result.add(platformPluginDescriptor);
           }
+        }
 
-          IdeaPluginDescriptorImpl pluginDescriptor = loadDescriptor(file, PLUGIN_XML);
-          if (platformPrefix != null && pluginDescriptor != null && pluginDescriptor.getName().equals(SPECIAL_IDEA_PLUGIN)) {
-            continue;
+        IdeaPluginDescriptorImpl pluginDescriptor = loadDescriptor(file, PLUGIN_XML);
+        if (platformPrefix != null && pluginDescriptor != null && pluginDescriptor.getName().equals(SPECIAL_IDEA_PLUGIN)) {
+          continue;
+        }
+        if (pluginDescriptor != null && !result.contains(pluginDescriptor)) {
+          if (platformPluginDescriptor != null) {
+            // if we found a regular plugin.xml in the same .jar/root as a platform-prefixed descriptor, use the core loader for it too
+            pluginDescriptor.setUseCoreClassLoader(true);
           }
-          if (pluginDescriptor != null && !result.contains(pluginDescriptor)) {
-            if (platformPluginDescriptor != null) {
-              // if we found a regular plugin.xml in the same .jar/root as a platform-prefixed descriptor, use the core loader for it too
-              pluginDescriptor.setUseCoreClassLoader(true);
-            }
-            result.add(pluginDescriptor);
-            if (progress != null) {
-              progress.showProgress("Plugin loaded: " + pluginDescriptor.getName(), PLUGINS_PROGRESS_MAX_VALUE * ((float)i / urls.size()));
-            }
+          result.add(pluginDescriptor);
+          if (progress != null) {
+            progress.showProgress("Plugin loaded: " + pluginDescriptor.getName(), PLUGINS_PROGRESS_MAX_VALUE * ((float)i / urls.size()));
           }
         }
       }
     }
-    catch (Exception e) {
-      System.err.println("Error loading plugins from classpath:");
-      e.printStackTrace();
-    }
   }
 
   static void loadDescriptorsFromProperty(final List<IdeaPluginDescriptorImpl> result) {