diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java
index 288baaa82ff..ab5e7d43e99 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java
@@ -55,7 +55,10 @@ public class ProblemPainter implements IPainter, PaintListener, IAnnotationModel
 	}
 	
 	private boolean hasProblems() {
-		return !fProblemPositions.isEmpty();
+		if (fProblemPositions != null) {
+			return !fProblemPositions.isEmpty();
+		}
+		return false;
 	}	
 	
 	protected void enablePainting() {