diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
index f05337b05a5c..6daffbd9efc7 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@ import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
 import com.intellij.util.CommonProcessors;
-import com.intellij.util.Processor;
-import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.io.KeyDescriptor;
 import gnu.trove.THashSet;
 import gnu.trove.TObjectHashingStrategy;
@@ -142,7 +140,7 @@ public class GenericCompilerRunner {
     }
 
     final List<T> selectedTargets = new ReadAction<List<T>>() {
-      protected void run(final Result<List<T>> result) {
+      protected void run(@NotNull final Result<List<T>> result) {
         result.setResult(instance.getSelectedTargets());
       }
     }.execute().getResultObject();
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 3d5567aff0ad..f226ed55a9e1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -6551,7 +6551,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       g.drawImage(sprites[spriteIndex++], x, y, null);
       if (spriteIndex == sprites.length) {
         nrp.set(false);
-        IdeGlassPaneUtil.find(component).removePainter(this);
+        ApplicationManager.getApplication().invokeLater(() -> IdeGlassPaneUtil.find(component).removePainter(this));
         component.repaint(x, y, SPRITE_SIZE, SPRITE_SIZE);
       }
       component.repaint(x, y, SPRITE_SIZE, SPRITE_SIZE);