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 e6365b9f670..416a6ebc581 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
@@ -41,7 +41,7 @@ public class ExternalSearchDocumentProvider extends TextFileDocumentProvider {
 	 */
 	protected FileInfo createFileInfo(Object element) throws CoreException {
 		final FileInfo info= super.createFileInfo(element);
-		if (info.fModel == null) {
+		if (info != null && info.fModel == null) {
 			info.fModel= createAnnotationModel(element);
 			if (info.fModel != null) {
 				IAnnotationModel fileBufferAnnotationModel= info.fTextFileBuffer.getAnnotationModel();