From 682bb38ac3c076ed201fe4de9fe1d26754a59d8d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 3 Jul 2013 17:42:25 +0400
Subject: [PATCH] NPE

---
 .../com/intellij/codeHighlighting/HighlightDisplayLevel.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
index 34133f67d6de..f8cd9d74097e 100644
--- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
+++ b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
@@ -18,6 +18,7 @@ package com.intellij.codeHighlighting;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.Comparing;
@@ -111,7 +112,9 @@ public class HighlightDisplayLevel {
   private static Icon createIconByMask(@NotNull TextAttributesKey key) {
     Icon icon = createIconByMaskFromExtensions(key);
     if (icon != null) return icon;
-    return createIconByMask(key.getDefaultAttributes().getErrorStripeColor());
+    TextAttributes defaultAttributes = key.getDefaultAttributes();
+    if (defaultAttributes == null) defaultAttributes = TextAttributes.ERASE_MARKER;
+    return createIconByMask(defaultAttributes.getErrorStripeColor());
   }
 
   public interface IconCreator {