--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Mon Jul 19 21:06:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Tue Jul 20 13:38:47 2010 -0500
@@ -313,8 +313,9 @@
 
 	@Override
 	public String getToolChain() {
-		Map<String, String> buildMacros = configQueryData.getBuildMacros();
-		if (buildMacros != null) {
+		
+		if (configQueryData != null) {
+			Map<String, String> buildMacros = configQueryData.getBuildMacros();
 			// try to figure out the tool chain using macros from Raptor config query
 			if (buildMacros.containsKey(MACRO_ARM)) {
 				return TOOLCHAIN_ARM;
@@ -324,7 +325,7 @@
 				return TOOLCHAIN_WINSCW;
 			}
 		} else {
-			// if no macros available, use alais name instead
+			// if no macros available, use alias name instead
 			if (sbsv2Alias.toUpperCase().contains(TOOLCHAIN_ARM)) {
 				return TOOLCHAIN_ARM;
 			} else if (sbsv2Alias.toUpperCase().contains(TOOLCHAIN_GCCE)) {