--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Fri Aug 14 14:35:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Tue Aug 18 11:45:34 2009 -0500
@@ -59,6 +59,11 @@
 			this.sourceLocation = basePath != null && filePath.getDevice() == null && !filePath.isAbsolute()
 				? basePath.append(filePath) : filePath;
 		}
+		
+		if (sourceLocation.getDevice() == null){
+			sourceLocation = sourceLocation.setDevice(basePath.getDevice());
+		}
+		
 	}
 	
 	/**

--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java	Fri Aug 14 14:35:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java	Tue Aug 18 11:45:34 2009 -0500
@@ -62,6 +62,9 @@
 			else
 				maskSourceLocation = basePath.append(maskPath);
 		}
+		if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){
+			maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice());
+		}
 	}
 
 	/**
@@ -81,6 +84,9 @@
 			else
 				maskSourceLocation = basePath.append(maskPath);
 		}
+		if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){
+			maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice());
+		}
 	}