diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
index 6b6960a0fb3..88e3dd79698 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
@@ -622,8 +622,14 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab {
 			setBackgroundText(msg);
 		usercomp.setVisible(visible);
 		buttoncomp.setVisible(visible);
-		page.getAButton().setVisible(visible);
-		page.getDButton().setVisible(visible);
+		if (page != null) {
+			Button b = page.getAButton();
+			if (b != null)
+				b.setVisible(visible);
+			b = page.getDButton();
+			if (b != null)
+				b.setVisible(visible);
+		}
 	}
 	
 	/**