diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
index ad03da45089..d1dccbb1167 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
@@ -299,6 +299,7 @@ public class HoldsOptions extends BuildObject implements IHoldsOptions {
 				return superClass.getOptionById(id);
 			}
 		}
+		if (opt == null) return null;
 		return opt.isValid() ? opt : null;
 	}