diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index de677c551e2..d64dfc5d2c9 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-08 Alain Magloire
+	Fix PR 98846
+	* src/org/eclipse/cdt/internal/ui/util/ResourceTOItemsMapper.java
+
 2005-06-08 Alain Magloire
 	Move to the IContentTypeManager framework: PR 86645
 	* src/org/eclipse/cdt/internal/ui/CFileElementWorkingCopy.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java
index adbd9422ea4..a0dc1c80f7c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java
@@ -74,7 +74,7 @@ public class ResourceToItemsMapper {
 			Object data= item.getData();
 			
 			// If it is an IItemLabelProvider than short circuit: patch Tod (bug 55012)
-			if (lprovider instanceof IViewerLabelProvider) {
+			if (data != null && lprovider instanceof IViewerLabelProvider) {
 				IViewerLabelProvider provider= (IViewerLabelProvider) lprovider;
 				
 				ViewerLabel updateLabel= new ViewerLabel(item.getText(), item.getImage());