diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java
index 0fd1fdfa400..2255fe4d174 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java
@@ -198,7 +198,7 @@ class ASTBuiltinName extends ASTPreprocessorDefinition implements IAdaptable {
 		if (adapter.isAssignableFrom(ASTBuiltinName.class)) {
 			return this;
 		}
-		if (adapter.isAssignableFrom(fOriginalDefinition.getClass())) {
+		if (fOriginalDefinition != null && adapter.isAssignableFrom(fOriginalDefinition.getClass())) {
 			return fOriginalDefinition;
 		}
 		return null;