--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Tue Aug 18 11:45:34 2009 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Tue Aug 18 11:47:39 2009 -0500
@@ -60,8 +60,8 @@
 				? basePath.append(filePath) : filePath;
 		}
 		
-		if (sourceLocation.getDevice() == null){
-			sourceLocation = sourceLocation.setDevice(basePath.getDevice());
+		if (this.sourceLocation != null && this.sourceLocation.getDevice() == null){
+			this.sourceLocation = this.sourceLocation.setDevice(basePath.getDevice());
 		}
 		
 	}