diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 97e089cbaa7..aeb28f8607c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -2879,7 +2879,10 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 			}
 			fFile2Storage.put(file, sourceElement);
 		} else if (sourceElement == null) {
-			logWarning(DisassemblyMessages.Disassembly_log_error_locateFile+file, null);
+			if (!fFile2Storage.containsKey(file)) {
+				logWarning(DisassemblyMessages.Disassembly_log_error_locateFile+file, null);
+	            fFile2Storage.put(file, null);
+			}
 		} else {
             fFile2Storage.put(file, null);
             assert false : "missing support for source element of type " + sourceElement.getClass().toString(); //$NON-NLS-1$