From 93e379a413be0663e56494512a8ad782a43dff4a Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Thu, 10 Nov 2016 18:03:56 +0300
Subject: [PATCH] EA-88507 - IAE: CollapseTagIntention.a

---
 .../src/com/intellij/xml/util/CollapseTagIntention.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xml/xml-analysis-impl/src/com/intellij/xml/util/CollapseTagIntention.java b/xml/xml-analysis-impl/src/com/intellij/xml/util/CollapseTagIntention.java
index 5942af7b89cf..3b39ef3128bf 100644
--- a/xml/xml-analysis-impl/src/com/intellij/xml/util/CollapseTagIntention.java
+++ b/xml/xml-analysis-impl/src/com/intellij/xml/util/CollapseTagIntention.java
@@ -73,7 +73,10 @@ public class CollapseTagIntention implements LocalQuickFix, IntentionAction {
 
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-    applyFix(project, getTag(editor, file));
+    XmlTag tag = getTag(editor, file);
+    if (tag != null) {
+      applyFix(project, tag);
+    }
   }
 
   private static XmlTag getTag(Editor editor, PsiFile file) {