diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index 2d9bf4a..a9b71f8 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -780,7 +780,7 @@ private Dictionary<string, string> HarvestCurrentParameters(string vaultPrefixFo
             }
             else
             {
-                var controlValue = controlRecord.GetFormattedValue().Trim();
+                var controlValue = controlRecord.GetFormattedValue()?.Trim();
                 defaultOverrides[controlRecord.Name] = controlValue;
             }
         }
@@ -877,7 +877,7 @@ private void ExecuteCommand(string command, ScriptConfig selectedAction, bool us
         var maskedArgs = args;
         foreach (var controlRecord in _controlRecords)
         {
-            var controlValue = controlRecord.GetFormattedValue().Trim();
+            var controlValue = controlRecord.GetFormattedValue()?.Trim();
             args = args.Replace($"{{{controlRecord.Name}}}", controlValue);
             maskedArgs = maskedArgs.Replace($"{{{controlRecord.Name}}}", controlRecord.MaskingRequired? "*****": controlValue);