diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameGlobalAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameGlobalAction.java
index a15b02f290..789fddb131 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameGlobalAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameGlobalAction.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,6 +73,7 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
 		final ClangToken tokenAtCursor = context.getTokenAtCursor();
 		HighSymbol highSymbol = tokenAtCursor.getHighSymbol(context.getHighFunction());
 		Symbol symbol = null;
+		AddEditDialog dialog = new AddEditDialog("Rename Global", context.getTool());
 		if (highSymbol instanceof HighCodeSymbol) {
 			symbol = ((HighCodeSymbol) highSymbol).getCodeSymbol();
 			if (symbol == null) {
@@ -80,6 +81,11 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
 				Address addr = ((HighCodeSymbol) highSymbol).getStorage().getMinAddress();
 				SymbolTable symbolTable = context.getProgram().getSymbolTable();
 				symbol = symbolTable.getPrimarySymbol(addr);
+				if (symbol == null) {
+					// there may be no default primary symbol when it is an offcut reference
+					dialog.addLabel(addr, context.getProgram());
+					return;
+				}
 			}
 		}
 		if (symbol == null) {
@@ -87,7 +93,6 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
 				"Memory storage not found for global variable");
 			return;
 		}
-		AddEditDialog dialog = new AddEditDialog("Rename Global", context.getTool());
 		dialog.editLabel(symbol, context.getProgram());
 	}
 }