diff --git a/Functions/Setup/Support/Get-NetboxAPIDefinition.ps1 b/Functions/Setup/Support/Get-NetboxAPIDefinition.ps1
index 5c8095a..ca4e90e 100644
--- a/Functions/Setup/Support/Get-NetboxAPIDefinition.ps1
+++ b/Functions/Setup/Support/Get-NetboxAPIDefinition.ps1
@@ -6,16 +6,16 @@ function Get-NetboxAPIDefinition {
         [ValidateSet('json', 'yaml', IgnoreCase = $true)]
         [string]$Format = 'json'
     )
-    
+
     #$URI = "https://netbox.neonet.org/api/schema/?format=json"
-    
+
     $Segments = [System.Collections.ArrayList]::new(@('schema'))
-    
+
     $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary @{
         'format' = $Format.ToLower()
     }
-    
+
     $URI = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters -SkipConnectedCheck
-    
+
     InvokeNetboxRequest -URI $URI
 }
diff --git a/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1 b/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1
index 50ce77a..342c637 100644
--- a/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1
+++ b/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1
@@ -60,7 +60,7 @@ function New-NetboxContactRole {
 
         $URI = BuildNewURI -Segments $URIComponents.Segments
 
-        if ($PSCmdlet.ShouldProcess($Address, 'Create new contact')) {
+        if ($PSCmdlet.ShouldProcess($Name, 'Create new contact')) {
             InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
         }
     }
diff --git a/Functions/Tenancy/Contacts/New-NetboxContact.ps1 b/Functions/Tenancy/Contacts/New-NetboxContact.ps1
index 93a158e..5ab19fe 100644
--- a/Functions/Tenancy/Contacts/New-NetboxContact.ps1
+++ b/Functions/Tenancy/Contacts/New-NetboxContact.ps1
@@ -88,7 +88,7 @@ function New-NetboxContact {
 
         $URI = BuildNewURI -Segments $URIComponents.Segments
 
-        if ($PSCmdlet.ShouldProcess($Address, 'Create new contact')) {
+        if ($PSCmdlet.ShouldProcess($Name, 'Create new contact')) {
             InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
         }
     }
diff --git a/Functions/Tenancy/Contacts/Set-NetboxContact.ps1 b/Functions/Tenancy/Contacts/Set-NetboxContact.ps1
index b1d91b0..aae70fd 100644
--- a/Functions/Tenancy/Contacts/Set-NetboxContact.ps1
+++ b/Functions/Tenancy/Contacts/Set-NetboxContact.ps1
@@ -106,7 +106,7 @@ function Set-NetboxContact {
 
             $URI = BuildNewURI -Segments $URIComponents.Segments
 
-            $CurrentContact = Get-NetboxContact -Id $ContactId
+            $CurrentContact = Get-NetboxContact -Id $ContactId -ErrorAction Stop
 
             if ($Force -or $PSCmdlet.ShouldProcess($CurrentContact.Name, 'Update contact')) {
                 InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw