From 1d238579448e402e534a0880dbb01e58d3bb925c Mon Sep 17 00:00:00 2001
From: Vassiliy <vassiliy.kudryashov@jetbrains.com>
Date: Wed, 16 Apr 2014 20:11:33 +0400
Subject: [PATCH] Start plugins wizard #13

---
 .../src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java  | 2 +-
 .../src/com/intellij/ide/plugins/PluginManagerCore.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
index 92ea3e1086ba..3bfae45dde59 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
@@ -648,7 +648,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
     } catch (IOException e) {
       path = getPath().getAbsolutePath();
     }
-    if (ApplicationManager.getApplication().isInternal()) {
+    if (ApplicationManager.getApplication() != null && ApplicationManager.getApplication().isInternal()) {
       if (path.startsWith(PathManager.getHomePath() + File.separator + "out" + File.separator + "classes")) {
         return true;
       }
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 2448646dd63e..5ad30606839d 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -673,7 +673,7 @@ public class PluginManagerCore {
       descriptor = loadDescriptorFromJar(file, fileName);
     }
 
-    if (descriptor != null && !descriptor.getOptionalConfigs().isEmpty()) {
+    if (descriptor != null && descriptor.getOptionalConfigs() != 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()) {
         String optionalDescriptorName = entry.getValue();