1 files changed, 5 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java
index 818696a3c0e..022f5e5c103 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java
@@ -70,9 +70,11 @@ public class GeneratePDOM implements ISafeRunnable {
 		try {
 			final IIndexManager im = CCorePlugin.getIndexManager();
 			for (int i = 0; i < 20; i++) {
-				im.joinIndexer(Integer.MAX_VALUE, new NullProgressMonitor());
-				if (!im.isIndexerSetupPostponed(cproject)) {
-					break;
+				if(CCoreInternals.getPDOMManager().isProjectRegistered(cproject)) {
+					im.joinIndexer(Integer.MAX_VALUE, new NullProgressMonitor());
+					if (!im.isIndexerSetupPostponed(cproject)) {
+						break;
+					}
 				}
 				Thread.sleep(200);
 			}