diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java
index 2ec73d6898..32b7161418 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java
@@ -29,6 +29,7 @@ import ghidra.program.model.address.AddressSet;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramLocation;
 import ghidra.program.util.ProgramSelection;
+import ghidra.util.Swing;
 import ghidra.util.SystemUtilities;
 
 /**
@@ -64,7 +65,9 @@ public class GhidraState {
 		this.currentHighlight = highlight;
 		this.isGlobalState = true;
 		if (!SystemUtilities.isInHeadlessMode()) {
-			gatherParamPanel = new GatherParamPanel(this);
+			Swing.runNow(() -> {
+				gatherParamPanel = new GatherParamPanel(this);
+			});
 		}
 	}
 
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java
index 507a99625a..af8f7bc57b 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java
@@ -84,8 +84,10 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
 	}
 
 	private void clearScriptCachedValues() {
-		Map<?, ?> map = (Map<?, ?>) TestUtils.getInstanceField("askMap", script);
-		map.clear();
+		if (script != null) {
+			Map<?, ?> map = (Map<?, ?>) TestUtils.getInstanceField("askMap", script);
+			map.clear();
+		}
 	}
 
 	@Test