From 85572d7602e8a246a551a0c4cc86de086490615a Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sun, 15 May 2011 12:08:05 +0400
Subject: [PATCH] EA-27117 NPE fix

---
 .../com/intellij/openapi/vcs/actions/AnnotationFieldGutter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotationFieldGutter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotationFieldGutter.java
index f4ee40e12b0b..ddb9302486c5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotationFieldGutter.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotationFieldGutter.java
@@ -155,7 +155,7 @@ public class AnnotationFieldGutter implements ActiveAnnotationGutter {
     if (myColorScheme == null || !myShowBg) return null;
     final String s = getLineText(line, editor);
     final VcsRevisionNumber number = myAnnotation.getLineRevisionNumber(line);
-    if (number == null) return null;
+    if (number == null || s == null) return null;
     final Color bg = myColorScheme.get(number.asString());
     return bg == null ? findBgColor(s) : bg;
   }