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(); }