diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
index 5b6efbf699c..9feb03a44d8 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
@@ -209,7 +209,8 @@ public class ToolSettingsPrefStore implements IPreferenceStore {
 			
 			IOption option = (IOption)options[i][1];
 			
-			if(option.getName().equals(name) //TODO: name vs ID !
+			String optionName = option.getName(); 
+			if( ((optionName != null) && optionName.equals(name)) //TODO: name vs ID !
 					|| ((!option.isExtensionElement() || ((Option)option).isAdjustedExtension() || ((Option)option).wasOptRef())
 						&& option.getSuperClass() != null
 						&& option.getSuperClass().getId().equals(name)))