diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java
index 55ebe86cbd..7f2fc09536 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java
@@ -911,11 +911,13 @@ public class DBTraceProgramView implements TraceProgramView {
 
 	@Override
 	public String getCompiler() {
-		return null;
+		// TODO: not yet implemented
+		return "unknown";
 	}
 
 	@Override
 	public void setCompiler(String compiler) {
+		// TODO: not yet implemented
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
index 8495ce7f8d..81df013870 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
@@ -35,7 +35,7 @@ public class RustDemangler implements Demangler {
 	@Override
 	public boolean canDemangle(Program program) {
 		String name = program.getCompiler();
-		return name != null && name.contains("rustc");
+		return name.contains("rustc");
 	}
 
 	@Override
diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/StubProgram.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/StubProgram.java
index 8644803ab8..1a1b854b04 100644
--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/StubProgram.java
+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/StubProgram.java
@@ -397,7 +397,7 @@ public class StubProgram implements Program {
 
 	@Override
 	public String getCompiler() {
-		throw new UnsupportedOperationException();
+		return "unknown";
 	}
 
 	@Override