From 34e40215824f8fe7221c4c78a05481b9f0bc76ed Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 28 Nov 2016 16:43:20 +0100
Subject: [PATCH] [platform] NPE in half-initialized app (ZD-814904)

---
 .../application/impl/ApplicationImpl.java     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index 0b1b5458df4f..35c0d231d485 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -379,25 +379,28 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
     return myInvokator;
   }
 
-
   @Override
-  public void invokeLater(@NotNull final Runnable runnable) {
+  public void invokeLater(@NotNull Runnable runnable) {
     invokeLater(runnable, getDisposed());
   }
 
   @Override
-  public void invokeLater(@NotNull final Runnable runnable, @NotNull final Condition expired) {
+  public void invokeLater(@NotNull Runnable runnable, @NotNull Condition expired) {
     invokeLater(runnable, ModalityState.defaultModalityState(), expired);
   }
 
   @Override
-  public void invokeLater(@NotNull final Runnable runnable, @NotNull final ModalityState state) {
+  public void invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state) {
     invokeLater(runnable, state, getDisposed());
   }
 
   @Override
-  public void invokeLater(@NotNull final Runnable runnable, @NotNull final ModalityState state, @NotNull final Condition expired) {
-    myInvokator.invokeLater(((TransactionGuardImpl)TransactionGuard.getInstance()).wrapLaterInvocation(runnable, state), state, expired);
+  public void invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state, @NotNull Condition expired) {
+    TransactionGuard guard = TransactionGuard.getInstance();
+    if (guard != null) {
+      runnable = ((TransactionGuardImpl)guard).wrapLaterInvocation(runnable, state);
+    }
+    myInvokator.invokeLater(runnable, state, expired);
   }
 
   @Override
@@ -671,7 +674,11 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
       LOG.error("Calling invokeAndWait from read-action leads to possible deadlock.");
     }
 
-    LaterInvocator.invokeAndWait(((TransactionGuardImpl)TransactionGuard.getInstance()).wrapLaterInvocation(runnable, modalityState), modalityState);
+    TransactionGuard guard = TransactionGuard.getInstance();
+    if (guard != null) {
+      runnable = ((TransactionGuardImpl)guard).wrapLaterInvocation(runnable, modalityState);
+    }
+    LaterInvocator.invokeAndWait(runnable, modalityState);
   }
 
   @Override