diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
index 0eb119dc8f6..f203b9bb399 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
@@ -88,6 +88,13 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
 	}
 	
 	public static CConfigBasedDescriptorManager getInstance(){
+		if(fInstance == null){
+			fInstance = getInstanceSynch();
+		}
+		return fInstance;
+	}
+
+	public static synchronized CConfigBasedDescriptorManager getInstanceSynch(){
 		if(fInstance == null){
 			fInstance = new CConfigBasedDescriptorManager();
 		}