diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
index 0512f3f131..c85a5f5594 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
@@ -104,6 +104,10 @@ public class GTreeStartEditingTask extends GTreeTask {
 
 		@Override
 		public void treeNodesInserted(TreeModelEvent e) {
+			if (newName == null) {
+				return; // editing cancelled
+			}
+
 			Object[] children = e.getChildren();
 			for (Object object : children) {
 				GTreeNode node = (GTreeNode) object;
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLConnection.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLConnection.java
index ea0661d42d..efa100a385 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLConnection.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLConnection.java
@@ -55,7 +55,7 @@ public class GhidraURLConnection extends URLConnection {
 		 * This status code includes a variety of connection errors
 		 * which are reported/logged by the Ghidra Server support code.
 		 * This error may also occur when the connection is not allowed
-		 * by the user (see {@link GhidraURLAllowListProvider}).
+		 * by the user (see {@link DefaultGhidraUrlAllowListProvider}).
 		 */
 		UNAVAILABLE(503, "Unavailable");