--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java	Wed Apr 28 15:26:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java	Thu Apr 29 13:46:13 2010 -0500
@@ -83,7 +83,10 @@
 	}
 	
 	public boolean performOk() {
-		sbsv1Tab.performOk();
+		
+		if (sbsv1Tab != null){
+			sbsv1Tab.performOk();
+		}
 		
 		if (sbsv2Tab != null) {
 			sbsv2Tab.performOk();
@@ -100,8 +103,13 @@
 
 	@Override
 	protected void performDefaults() {
-		sbsv1Tab.setDefaults();
-		sbsv2Tab.setDefaults();
+		
+		if (sbsv1Tab != null)
+			sbsv1Tab.setDefaults();
+		
+		if (sbsv2Tab != null)
+			sbsv2Tab.setDefaults();
+		
 		super.performDefaults();
 	}
 	

--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Wed Apr 28 15:26:18 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Thu Apr 29 13:46:13 2010 -0500
@@ -89,7 +89,7 @@
     public IStatus validate() {
 		useSBSv2Builder = true;
 		IStatus status = null;
-		if (builderCombo != null && builderCombo.getSelectionIndex() == 1) { 
+		if (builderCombo != null) { 
 			int index = builderCombo.getSelectionIndex();
 			String selection = builderCombo.getItem(index);
 			if (selection.equals(Messages.getString("NewProjectPage.sbsv1"))) { //$NON-NLS-1$