diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
index 51f9c06d80c..3ca732dbf9a 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
@@ -626,10 +626,13 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
 		if (projectContainers == null) {
 			projectContainers = new HashMap();
 			Containers.put(cproject, projectContainers);
-			// Initialize the first time with a lock
-			projectContainers.put(containerPath, new PathEntryContainerLock());
 		}
 		IPathEntryContainer container = (IPathEntryContainer) projectContainers.get(containerPath);
+		// Initialize the first time with a lock
+		if (container == null) {
+			container = new PathEntryContainerLock();
+			projectContainers.put(containerPath, container);
+		}
 		return container;
 	}