diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
index 8e1f92d549..2edf4ce150 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
@@ -94,6 +94,9 @@ public abstract class AbstractDecompilerAction extends DockingAction {
 	 * @return the associated HighSymbol or null if one can't be found
 	 */
 	public static HighSymbol findHighSymbolFromToken(ClangToken token, HighFunction highFunction) {
+		if (highFunction == null) {
+			return null;
+		}
 		HighVariable variable = token.getHighVariable();
 		HighSymbol highSymbol = null;
 		if (variable == null) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java b/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java
index 74fb2ff849..9e93d2d521 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java
@@ -108,7 +108,7 @@ public class WindowActionManager {
 		// In order to make the action updating be as responsive as possible and still be complete,
 		// we have chosen a policy that will reduce a flurry of contextChanged call into two
 		// actual calls - one that occurs immediately and one when the flurry times out.
-		updateManager.updateLater();
+		updateManager.update();
 	}
 
 	private synchronized void processContextChanged() {