From f6064b45006ed4ecf5cf7ac60f3d5923017ec546 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 3 Jun 2013 12:40:10 +0400
Subject: [PATCH] NPE in startup dialog fixed

---
 .../src/com/intellij/openapi/ui/DialogWrapper.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 50e986ffe7eb..bb4e680e3f25 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -235,7 +235,12 @@ public abstract class DialogWrapper {
 
   protected DialogWrapper(Project project, boolean canBeParent, boolean applicationModalIfPossible) {
     ensureEventDispatchThread();
-    myPeer = createPeer(WindowManager.getInstance().suggestParentWindow(project), canBeParent, applicationModalIfPossible);
+    if (ApplicationManager.getApplication() != null) {
+      myPeer = createPeer(WindowManager.getInstance().suggestParentWindow(project), canBeParent, applicationModalIfPossible);
+    }
+    else {
+      myPeer = createPeer(null, canBeParent, applicationModalIfPossible);
+    }
     createDefaultActions();
   }