diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
index 657c1e9a5f..a2074f9bf1 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
@@ -15,7 +15,7 @@
  */
 package ghidra.app.plugin.core.debug.gui.modules;
 
-import static ghidra.framework.main.DataTreeDialogType.OPEN;
+import static ghidra.framework.main.DataTreeDialogType.*;
 
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -1447,7 +1447,7 @@ public class DebuggerModulesProvider extends ComponentProviderAdapter {
 	}
 
 	protected void cleanMissingProgramMessages(Trace closedTrace, Program closedProgram) {
-		if (traceManager == null) {
+		if (traceManager == null || consoleService == null) {
 			return;
 		}
 		for (ActionContext ctx : consoleService.getActionContexts()) {