diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java
index e8ed536e55..6f8045b6b9 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java
@@ -822,11 +822,7 @@ public class FunctionEditorModel {
 
 					for (ParamInfo paramInfo : functionData.getParameters()) {
 						Parameter param = function.getParameter(paramInfo.getOrdinal());
-						if (param != null) {
-							if (param.getSymbol().isDeleted()) {
-								// concurrent removal of param - must do full update
-								break;
-							}
+						if (param != null && !param.isAutoParameter()) {
 							param.setName(paramInfo.getName(), SourceType.USER_DEFINED);
 						}
 					}
@@ -860,11 +856,7 @@ public class FunctionEditorModel {
 						: FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS,
 				true, sigSource);
 		}
-		catch (DuplicateNameException e) {
-			Msg.showError(this, null, "Function Edit Error", e.getMessage());
-			return false;
-		}
-		catch (InvalidInputException e) {
+		catch (Exception e) {
 			Msg.showError(this, null, "Function Edit Error", e.getMessage());
 			return false;
 		}