--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Thu Jun 17 11:41:12 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Thu Jun 17 14:00:47 2010 -0500
@@ -63,12 +63,7 @@
 		this.meaning = meaning;
 		this.configID = ISBSv2BuildContext.BUILDER_ID + "." + sbsv2Alias + "." + sdk.getUniqueId();
 		parseQueryConfigResults(contextQueryXML);
-		
-		if (configParseErrorMessage != null && configParseErrorMessage.length() > 0){
-			this.displayString = sbsv2Alias + " ERROR: " +  configParseErrorMessage;
-		} else {
-			this.displayString = sbsv2Alias + " [" + sdk.getUniqueId() + "]"; 
-		}
+		this.displayString = sbsv2Alias + " [" + sdk.getUniqueId() + "]"; 
 	}
 
 	@Override
@@ -84,7 +79,8 @@
 		}
 		
 		if (platform.contains(".")){
-			return platform.split(".")[0];
+			String[] tok = platform.split(".");
+			if (tok.length > 0) return tok[0];
 		}
 		return platform;
 	}
@@ -459,6 +455,7 @@
 	 * Error message, if any.
 	 * @return An error message if a problem occurred while trying to get config info from Raptor. Null if no error.
 	 */
+	@Override
 	public String getConfigurationErrorMessage(){
 		return configParseErrorMessage;
 	}