diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
index 1dea77e5f51d..c53aa37430c9 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
@@ -908,6 +908,7 @@ public class PluginManager {
     if (descriptor != null && !descriptor.getOptionalConfigs().isEmpty()) {
       final Map<PluginId, IdeaPluginDescriptorImpl> descriptors = new HashMap<PluginId, IdeaPluginDescriptorImpl>(descriptor.getOptionalConfigs().size());
       for (Map.Entry<PluginId, String> entry: descriptor.getOptionalConfigs().entrySet()) {
+        assert !Comparing.equal(fileName, entry.getValue()) : "recursive dependency: "+fileName;
         final IdeaPluginDescriptorImpl optionalDescriptor = loadDescriptor(file, entry.getValue());
         if (optionalDescriptor != null) {
           descriptors.put(entry.getKey(), optionalDescriptor);
@@ -1122,6 +1123,7 @@ public class PluginManager {
     ourDisabledPlugins = null;
   }
 
+  @NotNull
   public static List<String> getDisabledPlugins() {
     if (ourDisabledPlugins == null) {
       ourDisabledPlugins = new ArrayList<String>();