diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index 6c1eda4e0f0..59664032625 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -2031,7 +2031,9 @@ public class ManagedBuildManager extends AbstractCExtension {
 			}
 		}
 
-		buildInfo.setValid(true);
+		if (buildInfo != null) {
+			buildInfo.setValid(true);
+		}
 		return buildInfo;
 	}