diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java
index aceda024690..6389acb20eb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java
@@ -502,14 +502,14 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener {
 	 */
 	private void updateCursorLine() {
 		try {
-
 			IDocument document= fTextViewer.getDocument();
-			int lineNumber= document.getLineOfOffset(getDocumentOffset(fTextWidget.getCaretOffset()));
-
-			fCursorLine.isDeleted= false;
-			fCursorLine.offset= document.getLineOffset(lineNumber);
-			fCursorLine.length= 0;
-
+			if (document != null) {
+				int lineNumber= document.getLineOfOffset(getDocumentOffset(fTextWidget.getCaretOffset()));
+	
+				fCursorLine.isDeleted= false;
+				fCursorLine.offset= document.getLineOffset(lineNumber);
+				fCursorLine.length= 0;
+			}
 		} catch (BadLocationException e) {
 			// gracefully ignored
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
index a21e5d1370c..bf9958a80c2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
@@ -44,7 +44,7 @@ public class ExternalSearchDocumentProvider extends FileDocumentProvider {
 			FileInfo info= new FileInfo(d, m, null);
 			return info;
 		}
-		return null;
+		return super.createElementInfo(element);
 	}
 	
 	/**