diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
index 5195a6de76b..51ad9e341ba 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
@@ -489,9 +489,11 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 
 	private void handleDiscoveryProfileChanged() {
 		int pos = profileComboBox.getSelectionIndex();
-		for (int i = 0; i < realPages.length; i++)
-			if (realPages[i] != null)
-				realPages[i].setVisible(i == pos);
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++)
+				if (realPages[i] != null)
+					realPages[i].setVisible(i == pos);
+		}
 	}
 
 	/**
@@ -577,13 +579,15 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 		if (buildInfo == null)
 			return;
 		String savedId = buildInfo.getSelectedProfileId();
-		for (int i = 0; i < realPages.length; i++) {
-			if (realPages != null && realPages[i] != null) {
-				String s = visibleProfilesList.get(i);
-				buildInfo.setSelectedProfileId(s);
-				realPages[i].performApply();
-				realPages[i].setVisible(false);
-			}
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++) {
+				if (realPages[i] != null) {
+					String s = visibleProfilesList.get(i);
+					buildInfo.setSelectedProfileId(s);
+					realPages[i].performApply();
+					realPages[i].setVisible(false);
+				}
+			} 
 		}
 		buildInfo.setSelectedProfileId(savedId);
 		handleDiscoveryProfileChanged();