Fix potential errors

scripts/Common/Scripts/Software.ps1

@@ -363,6 +363,7 @@ $null = New-Module {
                     }
                     default {
                         if ((-not $Arguments.ContainsKey($userArgument)) -or (-not $Arguments[$userArgument])) {
+                            $Arguments.Remove($userArgument);
                             $Arguments.Add($userArgument, ($IsWindows ? $env:UserName : $env:USER));
                         }