diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java index 754bf2b5913f..7ab4d9b5273b 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -201,7 +201,9 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") public static void checkCanceled() throws ProcessCanceledException { - getInstance().doCheckCanceled(); + if (ourInstance != null) { + ourInstance.doCheckCanceled(); + } } /**