--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContextDataCache.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/SymbianBuildContextDataCache.java	Fri Aug 27 16:34:38 2010 -0500
@@ -159,7 +159,7 @@
 		
 		boolean buildCache = false;
 		
-		if (hrhFileInfo == null) {
+		if (hrhFileInfo == null || hrhFileInfo.getFiles().length == 0) {
 			// hasn't been built yet, or was flushed
 			buildCache = true;
 		} else {
@@ -311,7 +311,7 @@
 		
 		compilerPrefixFile = prefixFile;
 
-		if (compilerPrefixFileInfo == null ||
+		if (compilerPrefixFileInfo == null || compilerPrefixFile == null ||
 				compilerPrefixFileInfo.anyChanged()) {
 
 			changed = true;