--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Fri Aug 27 14:53:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Fri Aug 27 16:34:38 2010 -0500
@@ -142,6 +142,9 @@
 		if (sbsv2Alias.toUpperCase().contains(TOOLCHAIN_GCCE) ||
 			sbsv2Alias.toUpperCase().contains(TOOLCHAIN_ARM)) {
 			if (configQueryData != null) {
+				if (configQueryData.getBuildPrefix() != null && !(new File(configQueryData.getBuildPrefix()).exists())){
+					this.configQueryData = setConfigQueryData(sdk, getSBSv2Alias());
+				}
 				return new Path(configQueryData.getBuildPrefix());
 			}
 		} 
@@ -160,7 +163,7 @@
 
 	public List<IDefine> getCompilerPreincludeDefines() {
 		IPath prefixFile = getCompilerPrefixFile();
-		if (prefixFile == null || !prefixFile.toFile().exists()) {
+		if (prefixFile == null) {
 			return getCachedData().getCompilerMacros(null);
 		}
 		
@@ -391,11 +394,15 @@
 	 */
 	public IPath getPrefixFromVariantCfg(){
 		ISBSv2BuildInfo sbsv2BldInfo = ((ISBSv2BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER));
+		if (sbsv2BldInfo.getPrefixFromVariantCfg().toOSString().length() == 0){
+			return null;
+		}
 		return sbsv2BldInfo.getPrefixFromVariantCfg();
 	}
 
 	public List<IDefine> getBuildMacros() {
 		ISBSv2BuildInfo sbsv2BldInfo = ((ISBSv2BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER));
+		
 		Map<String, String> buildMacroMap = sbsv2BldInfo.getBuildMacros(getSBSv2Alias());
 		List<IDefine> defines = new ArrayList<IDefine>();
 		for (String macroName : buildMacroMap.keySet()){