--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java	Mon May 03 16:01:45 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java	Mon May 03 16:39:42 2010 -0500
@@ -89,7 +89,7 @@
 	public void initData(ICarbideBuildConfiguration buildConfig) {
 		this.config = buildConfig;
 		ISBSv2BuildConfigInfo sbsv2ConfigInfo = ((CarbideBuildConfiguration)buildConfig).getSBSv2ConfigInfo();
-		if (sbsv2ConfigInfo.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT) != null){
+		if (sbsv2ConfigInfo != null && sbsv2ConfigInfo.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT) != null){
 			variantEdit.setText(sbsv2ConfigInfo.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT));
 		}
 		
@@ -100,7 +100,11 @@
 		
 		String configCmdText = configCmdLabelPrefixText;
 		if (config != null){
-			configCmdText += config.getSBSv2Alias() + variantEdit.getText();
+			if (config.getSBSv2Alias() == null){
+				configCmdText += config.getPlatformString().toLowerCase() + "_" + config.getTargetString().toLowerCase() + variantEdit.getText();
+			} else {
+				configCmdText += config.getSBSv2Alias() + variantEdit.getText();
+			}
 		}
 		configCmdLabel.setText(configCmdText);
 
@@ -119,10 +123,12 @@
 		boolean settingsEqual = true;
 		
 		ISBSv2BuildConfigInfo currSBSv2Info = ((CarbideBuildConfiguration)selectedConfig).getSBSv2ConfigInfo();
-		settingsEqual = currSBSv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT).equals(variantEdit.getText());
-		
-		if (!settingsEqual && writeToConfig) {
-			currSBSv2Info.setSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT, variantEdit.getText());
+		if (currSBSv2Info != null){
+			settingsEqual = currSBSv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT).equals(variantEdit.getText());
+			
+			if (!settingsEqual && writeToConfig) {
+				currSBSv2Info.setSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT, variantEdit.getText());
+			}
 		}
 		
 		return settingsEqual;