diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 09c9ebdc6f5d..6b375936fafe 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -227,7 +227,9 @@ public class VariableInplaceRenamer {
             }
 
             //add highlights
-            addHighlights(rangesToHighlight, topLevelEditor, myHighlighters, highlightManager);
+            if (myHighlighters != null) { // can be null if finish is called during testing
+              addHighlights(rangesToHighlight, topLevelEditor, myHighlighters, highlightManager);
+            }
           }
         });
       }