diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 8d49e43b43c..d663c85d3b6 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-12 David Inglis
+
+	* model/.../internal/core/model/CModelManager.java,v
+		fixed model.create(IPath) method so it returns a element which 
+		actually exits
+
 2002-11-08 Judy N. Green
 	* src/org/eclipse/cdt/internal/core/COwner.java
 	fixed check in constructor to throw error when ownerID is invalid
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index cccbd2301f2..77cfbe4fcd9 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -108,8 +108,10 @@ public class CModelManager implements IResourceChangeListener {
 			if (path.equals(rootPath))
 				return getCRoot(root);
 			res = root.getContainerForLocation(path);
-			if (res == null)
+			if (res == null || !res.exists())
 				res = root.getFileForLocation(path);
+			if (res != null && !res.exists())
+				res = null;
 		}
 		return create (res);
 	}