diff -r f27f3399e676 -r 7903a1588fd4 project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java --- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java Wed Jun 02 18:27:30 2010 -0500 +++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java Thu Jun 03 09:58:29 2010 -0500 @@ -299,7 +299,10 @@ if (DEBUG_VERBOSE) { System.out.println("Found entry for " + key); //$NON-NLS-1$ } - cacheHits.put(key, cacheHits.get(key) + 1); + if ((cacheHits.get(key) != null)){ + cacheHits.put(key, cacheHits.get(key) + 1); + } + data = statefulData.second; } return data;