diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 382f18400a0..858bb60a75d 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-28 Alain Magloire
+
+	Fix for PR 68820.
+	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
+	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+	
 2004-06-27 Bogdan Gheorghe
 	Fix for Bug 67987: [Search] C Search results do no show up as editor annotations
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
index 4b2aa701689..997f2c1d2ff 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
@@ -336,8 +336,14 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
 	}
 	
 	private Object[] filterNonCResources(Object[] objects, ICProject cproject) throws CModelException {
-		ICElement[] binaries = getBinaries(cproject);
-		ICElement[] archives = getArchives(cproject);
+		ICElement[] binaries = null;
+		ICElement[] archives = null;
+		try {
+			binaries = getBinaries(cproject);
+			archives = getArchives(cproject);
+		} catch (CModelException e) {
+			archives = binaries = new ICElement[0];
+		}
 		ISourceRoot[] roots = null;
 		try {
 			roots = cproject.getSourceRoots();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
index 7456b8e78f0..59049796430 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
@@ -103,7 +103,7 @@ public class CElementImageProvider {
 		} else if (element instanceof IFile) {
 			// Check for Non Translation Unit.
 			IFile file = (IFile)element;
-			if (CoreModel.isTranslationUnit(file)) {
+			if (CoreModel.isValidTranslationUnitName(file.getProject(), file.getName())) {
 				descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE;
 				Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE;
 				descriptor = new CElementImageDescriptor(descriptor, 0, size);