From d50b8120d2bcd6748087a1da98a2791dc9393f4b Mon Sep 17 00:00:00 2001
From: 0x7FFFFFFFFFFFFFFF <39968+0x7FFFFFFFFFFFFFFF@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:25:12 +0800
Subject: [PATCH] Multiple Functions - Remove Stop-Function ErrorRecord
 parameter use outside of try-catch blocks (#9227)

---
 .../functions/New-DbaLogShippingPrimarySecondary.ps1   |  4 ++--
 public/Add-DbaAgReplica.ps1                            |  2 +-
 public/Add-DbaReplArticle.ps1                          |  8 ++++----
 public/Backup-DbaDbMasterKey.ps1                       |  2 +-
 public/Backup-DbaServiceMasterKey.ps1                  |  2 +-
 public/Enable-DbaReplPublishing.ps1                    |  2 +-
 public/Import-DbaCsv.ps1                               |  2 +-
 public/Import-DbaSpConfigure.ps1                       |  6 +++---
 public/Install-DbaWhoIsActive.ps1                      |  2 +-
 public/Invoke-DbaDbDataMasking.ps1                     |  2 +-
 public/Invoke-DbaDbDecryptObject.ps1                   |  2 +-
 public/Invoke-DbaDbLogShipRecovery.ps1                 |  2 +-
 public/Invoke-DbaDbLogShipping.ps1                     | 10 +++++-----
 public/Invoke-DbaDiagnosticQuery.ps1                   |  2 +-
 public/Measure-DbaDiskSpaceRequirement.ps1             |  2 +-
 public/New-DbaAvailabilityGroup.ps1                    |  2 +-
 public/New-DbaComputerCertificate.ps1                  |  2 +-
 public/New-DbaDbMailAccount.ps1                        |  2 +-
 public/New-DbaDbSnapshot.ps1                           |  2 +-
 public/New-DbaEndpoint.ps1                             |  2 +-
 public/New-DbaReplSubscription.ps1                     |  4 ++--
 public/New-DbaRgResourcePool.ps1                       |  2 +-
 public/Publish-DbaDacPackage.ps1                       |  2 +-
 public/Remove-DbaReplArticle.ps1                       |  2 +-
 public/Rename-DbaLogin.ps1                             |  2 +-
 public/Repair-DbaInstanceName.ps1                      |  2 +-
 public/Save-DbaCommunitySoftware.ps1                   |  6 +++---
 public/Set-DbaMaxDop.ps1                               |  2 +-
 public/Set-DbaResourceGovernor.ps1                     |  2 +-
 29 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/private/functions/New-DbaLogShippingPrimarySecondary.ps1 b/private/functions/New-DbaLogShippingPrimarySecondary.ps1
index 6e8b76f4ff..32429011ae 100644
--- a/private/functions/New-DbaLogShippingPrimarySecondary.ps1
+++ b/private/functions/New-DbaLogShippingPrimarySecondary.ps1
@@ -85,12 +85,12 @@ function New-DbaLogShippingPrimarySecondary {
 
     # Check if the database is present on the source sql server
     if ($serverPrimary.Databases.Name -notcontains $PrimaryDatabase) {
-        Stop-Function -Message "Database $PrimaryDatabase is not available on instance $SqlInstance" -ErrorRecord $_ -Target $SqlInstance -Continue
+        Stop-Function -Message "Database $PrimaryDatabase is not available on instance $SqlInstance" -Target $SqlInstance -Continue
     }
 
     # Check if the database is present on the destination sql server
     if ($serverSecondary.Databases.Name -notcontains $SecondaryDatabase) {
-        Stop-Function -Message "Database $SecondaryDatabase is not available on instance $SecondaryServer" -ErrorRecord $_ -Target $SecondaryServer -Continue
+        Stop-Function -Message "Database $SecondaryDatabase is not available on instance $SecondaryServer" -Target $SecondaryServer -Continue
     }
 
     $Query = "SELECT primary_database FROM msdb.dbo.log_shipping_primary_databases WHERE primary_database = '$PrimaryDatabase'"
diff --git a/public/Add-DbaAgReplica.ps1 b/public/Add-DbaAgReplica.ps1
index 58eb91fc94..abd6ef5668 100644
--- a/public/Add-DbaAgReplica.ps1
+++ b/public/Add-DbaAgReplica.ps1
@@ -209,7 +209,7 @@ function Add-DbaAgReplica {
             if ($Certificate) {
                 $cert = Get-DbaDbCertificate -SqlInstance $server -Certificate $Certificate
                 if (-not $cert) {
-                    Stop-Function -Message "Certificate $Certificate does not exist on $instance" -ErrorRecord $_ -Target $Certificate -Continue
+                    Stop-Function -Message "Certificate $Certificate does not exist on $instance" -Target $Certificate -Continue
                 }
             }
 
diff --git a/public/Add-DbaReplArticle.ps1 b/public/Add-DbaReplArticle.ps1
index 3fb0ac4ac6..3926afa565 100644
--- a/public/Add-DbaReplArticle.ps1
+++ b/public/Add-DbaReplArticle.ps1
@@ -112,11 +112,11 @@ function Add-DbaReplArticle {
 
         # Check that $CreationScriptOptions is a valid object
         if ($CreationScriptOptions -and ($CreationScriptOptions -isnot [Microsoft.SqlServer.Replication.CreationScriptOptions])) {
-            Stop-Function -Message "CreationScriptOptions should be the right type. Use New-DbaReplCreationScriptOptions to create the object" -ErrorRecord $_ -Target $instance -Continue
+            Stop-Function -Message "CreationScriptOptions should be the right type. Use New-DbaReplCreationScriptOptions to create the object" -Target $instance -Continue
         }
 
         if ($Filter -like 'WHERE*') {
-            Stop-Function -Message "Filter should not include the word 'WHERE'" -ErrorRecord $_ -Target $instance -Continue
+            Stop-Function -Message "Filter should not include the word 'WHERE'" -Target $instance -Continue
         }
 
         foreach ($instance in $SqlInstance) {
@@ -132,7 +132,7 @@ function Add-DbaReplArticle {
 
                     $pub = Get-DbaReplPublication -SqlInstance $instance -SqlCredential $SqlCredential -Name $Publication -EnableException:$EnableException
                     if (-not $pub) {
-                        Stop-Function -Message "Publication $Publication does not exist on $instance" -ErrorRecord $_ -Target $instance -Continue
+                        Stop-Function -Message "Publication $Publication does not exist on $instance" -Target $instance -Continue
                     }
                 }
             } catch {
@@ -180,7 +180,7 @@ function Add-DbaReplArticle {
                     if (-not ($article.IsExistingObject)) {
                         $article.Create()
                     } else {
-                        Stop-Function -Message "Article already exists in $Publication on $instance" -ErrorRecord $_ -Target $instance -Continue
+                        Stop-Function -Message "Article already exists in $Publication on $instance" -Target $instance -Continue
                     }
 
                     if ($pub.Type -in ('Transactional', 'Snapshot')) {
diff --git a/public/Backup-DbaDbMasterKey.ps1 b/public/Backup-DbaDbMasterKey.ps1
index 9f8702ef34..07b2f60e14 100644
--- a/public/Backup-DbaDbMasterKey.ps1
+++ b/public/Backup-DbaDbMasterKey.ps1
@@ -111,7 +111,7 @@ function Backup-DbaDbMasterKey {
             }
 
             if (-not (Test-DbaPath -SqlInstance $server -Path $Path)) {
-                Stop-Function -Message "$instance cannot access $Path" -Target $server -ErrorRecord $_ -Continue
+                Stop-Function -Message "$instance cannot access $Path" -Target $server -Continue
             }
 
             $actualPath = "$Path".TrimEnd('\').TrimEnd('/')
diff --git a/public/Backup-DbaServiceMasterKey.ps1 b/public/Backup-DbaServiceMasterKey.ps1
index ff4aa783fb..3aaff8e269 100644
--- a/public/Backup-DbaServiceMasterKey.ps1
+++ b/public/Backup-DbaServiceMasterKey.ps1
@@ -97,7 +97,7 @@ function Backup-DbaServiceMasterKey {
             }
 
             if (!(Test-DbaPath -SqlInstance $server -Path $Path)) {
-                Stop-Function -Message "$instance cannot access $Path" -Target $server -ErrorRecord $_ -Continue
+                Stop-Function -Message "$instance cannot access $Path" -Target $server -Continue
             }
 
 
diff --git a/public/Enable-DbaReplPublishing.ps1 b/public/Enable-DbaReplPublishing.ps1
index 5995d335d5..59c982f6c6 100644
--- a/public/Enable-DbaReplPublishing.ps1
+++ b/public/Enable-DbaReplPublishing.ps1
@@ -112,7 +112,7 @@ function Enable-DbaReplPublishing {
                     Stop-Function -Message "Unable to enable replication publishing" -ErrorRecord $_ -Target $instance -Continue
                 }
             } else {
-                Stop-Function -Message "$instance isn't currently enabled for distributing. Please enable that first." -ErrorRecord $_ -Target $instance -Continue
+                Stop-Function -Message "$instance isn't currently enabled for distributing. Please enable that first." -Target $instance -Continue
             }
         }
     }
diff --git a/public/Import-DbaCsv.ps1 b/public/Import-DbaCsv.ps1
index b7e622c5b9..c3adfbde3d 100644
--- a/public/Import-DbaCsv.ps1
+++ b/public/Import-DbaCsv.ps1
@@ -741,7 +741,7 @@ function Import-DbaCsv {
                             Path          = $file
                         }
                     } else {
-                        Stop-Function -Message "Transaction rolled back. Was the proper delimiter specified? Is the first row the column name?" -ErrorRecord $_
+                        Stop-Function -Message "Transaction rolled back. Was the proper delimiter specified? Is the first row the column name?"
                         return
                     }
                 }
diff --git a/public/Import-DbaSpConfigure.ps1 b/public/Import-DbaSpConfigure.ps1
index 91b9b8796f..866782e8a9 100644
--- a/public/Import-DbaSpConfigure.ps1
+++ b/public/Import-DbaSpConfigure.ps1
@@ -123,7 +123,7 @@ function Import-DbaSpConfigure {
             }
 
             if (-not (Test-SqlSa -SqlInstance $sourceserver -SqlCredential $SourceSqlCredential)) {
-                Stop-Function -Message "Not a sysadmin on $sourceserver. Quitting." -Category PermissionDenied -ErrorRecord $_ -Target $server -Continue
+                Stop-Function -Message "Not a sysadmin on $sourceserver. Quitting." -Category PermissionDenied -Target $server -Continue
             }
 
             try {
@@ -134,7 +134,7 @@ function Import-DbaSpConfigure {
             }
 
             if (-not (Test-SqlSa -SqlInstance $destserver -SqlCredential $DestinationSqlCredential)) {
-                Stop-Function -Message "Not a sysadmin on $destserver. Quitting." -Category PermissionDenied -ErrorRecord $_ -Target $server -Continue
+                Stop-Function -Message "Not a sysadmin on $destserver. Quitting." -Category PermissionDenied -Target $server -Continue
             }
 
             $source = $sourceserver.DomainInstanceName
@@ -148,7 +148,7 @@ function Import-DbaSpConfigure {
             }
 
             if (!(Test-SqlSa -SqlInstance $server -SqlCredential $SqlCredential)) {
-                Stop-Function -Message "Not a sysadmin on $server. Quitting." -Category PermissionDenied -ErrorRecord $_ -Target $server -Continue
+                Stop-Function -Message "Not a sysadmin on $server. Quitting." -Category PermissionDenied -Target $server -Continue
             }
 
             if (-not (Test-Path $Path)) {
diff --git a/public/Install-DbaWhoIsActive.ps1 b/public/Install-DbaWhoIsActive.ps1
index dfe14893c6..e3b0ddfaca 100644
--- a/public/Install-DbaWhoIsActive.ps1
+++ b/public/Install-DbaWhoIsActive.ps1
@@ -190,7 +190,7 @@ function Install-DbaWhoIsActive {
                             Status       = $status
                         }
                     } else {
-                        Stop-Function -Message "Failed to find database $Database on $instance or $Database is not writeable." -ErrorRecord $_ -Continue -Target $instance
+                        Stop-Function -Message "Failed to find database $Database on $instance or $Database is not writeable." -Continue -Target $instance
                     }
 
                 } catch {
diff --git a/public/Invoke-DbaDbDataMasking.ps1 b/public/Invoke-DbaDbDataMasking.ps1
index 2b26fea75f..17d1f6e494 100644
--- a/public/Invoke-DbaDbDataMasking.ps1
+++ b/public/Invoke-DbaDbDataMasking.ps1
@@ -279,7 +279,7 @@ function Invoke-DbaDbDataMasking {
                             Stop-Function -Message "Could not import csv data from file '$file'" -ErrorRecord $_ -Target $file
                         }
                     } else {
-                        Stop-Function -Message "Could not import dictionary file '$file'" -ErrorRecord $_ -Target $file
+                        Stop-Function -Message "Could not import dictionary file '$file'" -Target $file
                     }
                 }
             }
diff --git a/public/Invoke-DbaDbDecryptObject.ps1 b/public/Invoke-DbaDbDecryptObject.ps1
index 33d2afcbe8..261e7d9c5e 100644
--- a/public/Invoke-DbaDbDecryptObject.ps1
+++ b/public/Invoke-DbaDbDecryptObject.ps1
@@ -282,7 +282,7 @@ function Invoke-DbaDbDecryptObject {
                                 Stop-Function -Message "Couldn't convert the known plain to binary" -ErrorRecord $_ -Target $instance -Continue
                             }
                         } else {
-                            Stop-Function -Message "Something went wrong setting up the known plain" -ErrorRecord $_ -Target $instance -Continue
+                            Stop-Function -Message "Something went wrong setting up the known plain" -Target $instance -Continue
                         }
 
                         # Setup the query to change the object in SQL Server and roll it back getting the encrypted version
diff --git a/public/Invoke-DbaDbLogShipRecovery.ps1 b/public/Invoke-DbaDbLogShipRecovery.ps1
index a6fce9b1f1..640761cb63 100644
--- a/public/Invoke-DbaDbLogShipRecovery.ps1
+++ b/public/Invoke-DbaDbLogShipRecovery.ps1
@@ -133,7 +133,7 @@ function Invoke-DbaDbLogShipRecovery {
                 $agentStatus = $server.Query("SELECT COUNT(*) as AgentCount FROM master.dbo.sysprocesses WITH (nolock) WHERE Program_Name LIKE 'SQLAgent%'")
 
                 if ($agentStatus.AgentCount -lt 1) {
-                    Stop-Function -Message "The agent service is not in a running state. Please start the service." -ErrorRecord $_ -Target $server.name
+                    Stop-Function -Message "The agent service is not in a running state. Please start the service." -Target $server.name
                     return
                 }
             } catch {
diff --git a/public/Invoke-DbaDbLogShipping.ps1 b/public/Invoke-DbaDbLogShipping.ps1
index ecc4ef64c0..3a5dd34b2a 100644
--- a/public/Invoke-DbaDbLogShipping.ps1
+++ b/public/Invoke-DbaDbLogShipping.ps1
@@ -1122,7 +1122,7 @@ function Invoke-DbaDbLogShipping {
                     $setupResult = "Failed"
                     $comment = "Secondary database already exists on instance"
 
-                    Stop-Function -Message "Secondary database already exists on instance $destInstance." -ErrorRecord $_ -Target $destInstance -Continue
+                    Stop-Function -Message "Secondary database already exists on instance $destInstance." -Target $destInstance -Continue
                 }
 
                 # Check if the secondary database needs to be initialized
@@ -1231,7 +1231,7 @@ function Invoke-DbaDbLogShipping {
                             if ((Test-DbaPath -Path $FullBackupPath -SqlInstance $destInstance -SqlCredential $DestinationCredential) -ne $true) {
                                 $setupResult = "Failed"
                                 $comment = "The path to the full backup could not be reached"
-                                Stop-Function -Message ("The path to the full backup could not be reached. Check the path and/or the crdential") -ErrorRecord $_ -Target $destInstance -Continue
+                                Stop-Function -Message ("The path to the full backup could not be reached. Check the path and/or the crdential") -Target $destInstance -Continue
                             }
 
                             $BackupPath = $FullBackupPath
@@ -1240,7 +1240,7 @@ function Invoke-DbaDbLogShipping {
                             if ((Test-DbaPath -Path $UseBackupFolder -SqlInstance $destInstance -SqlCredential $DestinationCredential) -ne $true) {
                                 $setupResult = "Failed"
                                 $comment = "The path to the backup folder could not be reached"
-                                Stop-Function -Message ("The path to the backup folder could not be reached. Check the path and/or the crdential") -ErrorRecord $_ -Target $destInstance -Continue
+                                Stop-Function -Message ("The path to the backup folder could not be reached. Check the path and/or the crdential") -Target $destInstance -Continue
                             }
 
                             $BackupPath = $UseBackupFolder
@@ -1257,13 +1257,13 @@ function Invoke-DbaDbLogShipping {
                                 if ((Test-DbaPath -Path ($LastBackup[-1]).Path[-1] -SqlInstance $SourceSqlInstance -SqlCredential $SourceCredential) -ne $true) {
                                     $setupResult = "Failed"
                                     $comment = "The full backup could not be found"
-                                    Stop-Function -Message "The full backup could not be found on $($LastBackup.Path). Check path and/or credentials" -ErrorRecord $_ -Target $destInstance -Continue
+                                    Stop-Function -Message "The full backup could not be found on $($LastBackup.Path). Check path and/or credentials" -Target $destInstance -Continue
                                 }
                                 # Check if the source for the last full backup is remote and the backup is on a shared location
                                 elseif (($LastBackup.Computername -ne $SourceServerName) -and (($LastBackup[-1]).Path[-1].StartsWith('\\') -eq $false)) {
                                     $setupResult = "Failed"
                                     $comment = "The last full backup is not located on shared location"
-                                    Stop-Function -Message "The last full backup is not located on shared location. `n$($_.Exception.Message)" -ErrorRecord $_ -Target $destInstance -Continue
+                                    Stop-Function -Message "The last full backup is not located on shared location. `n$($_.Exception.Message)" -Target $destInstance -Continue
                                 } else {
                                     #$FullBackupPath = $LastBackup.Path
                                     $BackupPath = $LastBackup.Path
diff --git a/public/Invoke-DbaDiagnosticQuery.ps1 b/public/Invoke-DbaDiagnosticQuery.ps1
index 968a366c73..69661d941c 100644
--- a/public/Invoke-DbaDiagnosticQuery.ps1
+++ b/public/Invoke-DbaDiagnosticQuery.ps1
@@ -184,7 +184,7 @@ function Invoke-DbaDiagnosticQuery {
 
             $scriptfiles = Get-ChildItem "$base\bin\diagnosticquery\SQLServerDiagnosticQueries_*.sql"
             if (!$scriptfiles) {
-                Stop-Function -Message "Unable to download scripts, do you have an internet connection? $_" -ErrorRecord $_
+                Stop-Function -Message "Unable to download scripts, do you have an internet connection? $_"
                 return
             }
         }
diff --git a/public/Measure-DbaDiskSpaceRequirement.ps1 b/public/Measure-DbaDiskSpaceRequirement.ps1
index c9cb7a7976..725f83c3fe 100644
--- a/public/Measure-DbaDiskSpaceRequirement.ps1
+++ b/public/Measure-DbaDiskSpaceRequirement.ps1
@@ -209,7 +209,7 @@ function Measure-DbaDiskSpaceRequirement {
 
         $sourceDb = Get-DbaDatabase -SqlInstance $sourceServer -Database $Database -SqlCredential $SourceSqlCredential
         if (Test-Bound 'Database' -not) {
-            Stop-Function -Message "Database [$Database] MUST exist on Source Instance $Source." -ErrorRecord $_
+            Stop-Function -Message "Database [$Database] MUST exist on Source Instance $Source."
         }
         $sourceFiles = @($sourceDb.FileGroups.Files | Select-Object Name, FileName, Size, @{n = 'Type'; e = { 'Data' } })
         $sourceFiles += @($sourceDb.LogFiles | Select-Object Name, FileName, Size, @{n = 'Type'; e = { 'Log' } })
diff --git a/public/New-DbaAvailabilityGroup.ps1 b/public/New-DbaAvailabilityGroup.ps1
index 577626dd97..5e82eb0271 100644
--- a/public/New-DbaAvailabilityGroup.ps1
+++ b/public/New-DbaAvailabilityGroup.ps1
@@ -418,7 +418,7 @@ function New-DbaAvailabilityGroup {
         if ($Certificate) {
             $cert = Get-DbaDbCertificate -SqlInstance $Primary -SqlCredential $PrimarySqlCredential -Certificate $Certificate
             if (-not $cert) {
-                Stop-Function -Message "Certificate $Certificate does not exist on $Primary" -ErrorRecord $_ -Target $Primary
+                Stop-Function -Message "Certificate $Certificate does not exist on $Primary" -Target $Primary
                 return
             }
         }
diff --git a/public/New-DbaComputerCertificate.ps1 b/public/New-DbaComputerCertificate.ps1
index a03dff9fe4..257375331c 100644
--- a/public/New-DbaComputerCertificate.ps1
+++ b/public/New-DbaComputerCertificate.ps1
@@ -389,7 +389,7 @@ function New-DbaComputerCertificate {
                         Write-Message -Level Warning -Message "Something went wrong"
                         Write-Message -Level Warning -Message "$create"
                         Write-Message -Level Warning -Message "$submit"
-                        Stop-Function -Message "Failure when attempting to create the cert on $computer. Exception: $_" -ErrorRecord $_ -Target $computer -Continue
+                        Stop-Function -Message "Failure when attempting to create the cert on $computer. Exception: $_" -Target $computer -Continue
                     }
 
                     if ($Computer.IsLocalHost) {
diff --git a/public/New-DbaDbMailAccount.ps1 b/public/New-DbaDbMailAccount.ps1
index 04f7936c16..e29212e183 100644
--- a/public/New-DbaDbMailAccount.ps1
+++ b/public/New-DbaDbMailAccount.ps1
@@ -92,7 +92,7 @@ function New-DbaDbMailAccount {
 
             if (Test-Bound -ParameterName MailServer) {
                 if (-not (Get-DbaDbMailServer -SqlInstance $server -Server $MailServer) -and -not (Test-Bound -ParameterName Force)) {
-                    Stop-Function -Message "The mail server '$MailServer' does not exist on $instance. Use -Force if you need to create it anyway." -ErrorRecord $_ -Target $instance -Continue
+                    Stop-Function -Message "The mail server '$MailServer' does not exist on $instance. Use -Force if you need to create it anyway." -Target $instance -Continue
                 }
             }
 
diff --git a/public/New-DbaDbSnapshot.ps1 b/public/New-DbaDbSnapshot.ps1
index 14061309a7..d7ca5f1d2c 100644
--- a/public/New-DbaDbSnapshot.ps1
+++ b/public/New-DbaDbSnapshot.ps1
@@ -164,7 +164,7 @@ function New-DbaDbSnapshot {
             #Checks for path existence, left the length test because test-bound wasn't working for some reason
             if ($Path.Length -gt 0) {
                 if (!(Test-DbaPath -SqlInstance $server -Path $Path)) {
-                    Stop-Function -Message "$instance cannot access the directory $Path" -ErrorRecord $_ -Target $instance -Continue -EnableException $EnableException
+                    Stop-Function -Message "$instance cannot access the directory $Path" -Target $instance -Continue -EnableException $EnableException
                 }
             }
 
diff --git a/public/New-DbaEndpoint.ps1 b/public/New-DbaEndpoint.ps1
index 59c792d013..1b2a710adb 100644
--- a/public/New-DbaEndpoint.ps1
+++ b/public/New-DbaEndpoint.ps1
@@ -163,7 +163,7 @@ function New-DbaEndpoint {
             if ($Certificate) {
                 $cert = Get-DbaDbCertificate -SqlInstance $server -Certificate $Certificate
                 if (-not $cert) {
-                    Stop-Function -Message "Certificate $Certificate does not exist on $instance" -ErrorRecord $_ -Target $Certificate -Continue
+                    Stop-Function -Message "Certificate $Certificate does not exist on $instance" -Target $Certificate -Continue
                 }
             }
 
diff --git a/public/New-DbaReplSubscription.ps1 b/public/New-DbaReplSubscription.ps1
index 37ffff9b25..56ce43f6e0 100644
--- a/public/New-DbaReplSubscription.ps1
+++ b/public/New-DbaReplSubscription.ps1
@@ -217,7 +217,7 @@ function New-DbaReplSubscription {
 
                             $transSub.Create()
                         } else {
-                            Stop-Function -Message ("Publication {0} not found on {1}" -f $PublicationName, $instance) -ErrorRecord $_ -Target $instance -Continue
+                            Stop-Function -Message ("Publication {0} not found on {1}" -f $PublicationName, $instance) -Target $instance -Continue
                         }
 
                     } elseif ($pub.Type -eq 'Merge') {
@@ -288,7 +288,7 @@ function New-DbaReplSubscription {
                         }
 
                     } else {
-                        Stop-Function -Message ("Publication {0} not found on {1}" -f $PublicationName, $instance) -ErrorRecord $_ -Target $instance -Continue
+                        Stop-Function -Message ("Publication {0} not found on {1}" -f $PublicationName, $instance) -Target $instance -Continue
                     }
                 }
             } catch {
diff --git a/public/New-DbaRgResourcePool.ps1 b/public/New-DbaRgResourcePool.ps1
index 1b7758bf56..a083c6169b 100644
--- a/public/New-DbaRgResourcePool.ps1
+++ b/public/New-DbaRgResourcePool.ps1
@@ -140,7 +140,7 @@ function New-DbaRgResourcePool {
                             }
                         }
                     } else {
-                        Stop-Function -Message "Resource Pool '$resPool' already exists." -Category ResourceExists -ErrorRecord $_ -Target $existingResourcePool -Continue
+                        Stop-Function -Message "Resource Pool '$resPool' already exists." -Category ResourceExists -Target $existingResourcePool -Continue
                         return
                     }
                 }
diff --git a/public/Publish-DbaDacPackage.ps1 b/public/Publish-DbaDacPackage.ps1
index 94d641cc32..9b2b2c7488 100644
--- a/public/Publish-DbaDacPackage.ps1
+++ b/public/Publish-DbaDacPackage.ps1
@@ -141,7 +141,7 @@ function Publish-DbaDacPackage {
             }
         } elseif ($Type -eq 'Bacpac') {
             if ($ScriptOnly -or $GenerateDeploymentReport) {
-                Stop-Function -Message "ScriptOnly and GenerateDeploymentReport cannot be used in a Bacpac scenario." -ErrorRecord $_
+                Stop-Function -Message "ScriptOnly and GenerateDeploymentReport cannot be used in a Bacpac scenario."
                 return
             }
             $defaultColumns = 'ComputerName', 'InstanceName', 'SqlInstance', 'Database', 'Bacpac', 'Result', 'DeployOptions'
diff --git a/public/Remove-DbaReplArticle.ps1 b/public/Remove-DbaReplArticle.ps1
index a4354240a4..eb599946ed 100644
--- a/public/Remove-DbaReplArticle.ps1
+++ b/public/Remove-DbaReplArticle.ps1
@@ -136,7 +136,7 @@ function Remove-DbaReplArticle {
                     if (($art.IsExistingObject)) {
                         $art.Remove()
                     } else {
-                        Stop-Function -Message "Article doesn't exist in $PublicationName on $instance" -ErrorRecord $_ -Target $instance -Continue
+                        Stop-Function -Message "Article doesn't exist in $PublicationName on $instance" -Target $instance -Continue
                     }
                     $output.Status = "Removed"
                     $output.IsRemoved = $true
diff --git a/public/Rename-DbaLogin.ps1 b/public/Rename-DbaLogin.ps1
index 9f4ce5b6d1..352e90b9b6 100644
--- a/public/Rename-DbaLogin.ps1
+++ b/public/Rename-DbaLogin.ps1
@@ -95,7 +95,7 @@ function Rename-DbaLogin {
             $currentLogin = $server.Logins[$Login]
 
             if ( -not $currentLogin) {
-                Stop-Function -Message "Login '$login' not found on $instance" -ErrorRecord $_ -Target login -Continue
+                Stop-Function -Message "Login '$login' not found on $instance" -Target login -Continue
             }
 
             if ($Pscmdlet.ShouldProcess($SqlInstance, "Changing Login name from  [$Login] to [$NewLogin]")) {
diff --git a/public/Repair-DbaInstanceName.ps1 b/public/Repair-DbaInstanceName.ps1
index 7343540fd6..f130d0f91c 100644
--- a/public/Repair-DbaInstanceName.ps1
+++ b/public/Repair-DbaInstanceName.ps1
@@ -123,7 +123,7 @@ function Repair-DbaInstanceName {
                                 $result = $host.ui.PromptForChoice($title, $message, $options, 1)
 
                                 if ($result -eq 1) {
-                                    Stop-Function -Message "Failure" -Target $server -ErrorRecord $_ -Continue
+                                    Stop-Function -Message "Failure" -Target $server -Continue
                                 } else {
                                     Write-Message -Level Output -Message "`nPerforming sp_dropdistributor @no_checks = 1."
                                     $sql = "sp_dropdistributor @no_checks = 1"
diff --git a/public/Save-DbaCommunitySoftware.ps1 b/public/Save-DbaCommunitySoftware.ps1
index 439c2ae902..97b22e95a8 100644
--- a/public/Save-DbaCommunitySoftware.ps1
+++ b/public/Save-DbaCommunitySoftware.ps1
@@ -141,7 +141,7 @@ function Save-DbaCommunitySoftware {
                 }
                 $latestRelease = ($releasesJson | ConvertFrom-Json) | Where-Object prerelease -eq $preRelease | Select-Object -First 1
                 if ($null -eq $latestRelease) {
-                    Stop-Function -Message "No release found." -ErrorRecord $_
+                    Stop-Function -Message "No release found."
                     return
                 }
                 $Url = $latestRelease.assets[0].browser_download_url
@@ -171,7 +171,7 @@ function Save-DbaCommunitySoftware {
                 }
                 $latestRelease = ($releasesJson | ConvertFrom-Json) | Select-Object -First 1
                 if ($null -eq $latestRelease) {
-                    Stop-Function -Message "No release found." -ErrorRecord $_
+                    Stop-Function -Message "No release found."
                     return
                 }
                 $Url = $latestRelease.zipball_url
@@ -207,7 +207,7 @@ function Save-DbaCommunitySoftware {
                 }
                 $latestRelease = ($releasesJson | ConvertFrom-Json) | Select-Object -First 1
                 if ($null -eq $latestRelease) {
-                    Stop-Function -Message "No release found." -ErrorRecord $_
+                    Stop-Function -Message "No release found."
                     return
                 }
                 $Url = $latestRelease.zipball_url
diff --git a/public/Set-DbaMaxDop.ps1 b/public/Set-DbaMaxDop.ps1
index f12c1a3aa2..e78dba547e 100644
--- a/public/Set-DbaMaxDop.ps1
+++ b/public/Set-DbaMaxDop.ps1
@@ -136,7 +136,7 @@ function Set-DbaMaxDop {
             }
 
             if (!(Test-SqlSa -SqlInstance $server -SqlCredential $SqlCredential)) {
-                Stop-Function -Message "Not a sysadmin on $instance. Skipping." -Category PermissionDenied -ErrorRecord $_ -Target $instance -Continue
+                Stop-Function -Message "Not a sysadmin on $instance. Skipping." -Category PermissionDenied -Target $instance -Continue
             }
 
             if ($server.versionMajor -ge 13) {
diff --git a/public/Set-DbaResourceGovernor.ps1 b/public/Set-DbaResourceGovernor.ps1
index 01cd56e423..2ce9c5087c 100644
--- a/public/Set-DbaResourceGovernor.ps1
+++ b/public/Set-DbaResourceGovernor.ps1
@@ -118,7 +118,7 @@ function Set-DbaResourceGovernor {
                         if ($objClassifierFunction) {
                             $server.ResourceGovernor.ClassifierFunction = $objClassifierFunction
                         } else {
-                            Stop-Function -Message "Classifier function '$ClassifierFunction' does not exist." -Category ObjectNotFound -ErrorRecord $_ -Continue
+                            Stop-Function -Message "Classifier function '$ClassifierFunction' does not exist." -Category ObjectNotFound -Continue
                         }
                     }
                 }