diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java
index 6b2a8fa003..c4f8383f27 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java
@@ -480,7 +480,11 @@ public class Application {
 				exactFilename);
 		}
 
-		throw new OSFileNotFoundException(exactFilename);
+		if (file == null) {
+			throw new OSFileNotFoundException(exactFilename);
+		}
+		
+		return file;
 	}
 
 	private File findModuleFile(String subdirPath, String exactFilename) {