From c3184a41f8a7f2c9df04f6dd4f62aef8307fe741 Mon Sep 17 00:00:00 2001
From: Harshit Surana <hsurana@microsoft.com>
Date: Mon, 1 Sep 2025 23:21:53 +0530
Subject: [PATCH 1/4] Use ErrorAction Stop for Get Machine operations

---
 .../custom/Add-AzScVmmVMDisk.ps1              | 10 +++----
 .../custom/Add-AzScVmmVMNic.ps1               | 10 +++----
 .../ScVmm.Autorest/custom/Get-AzScVmmVM.ps1   | 11 ++++++--
 .../custom/Get-AzScVmmVMDisk.ps1              | 10 +++----
 .../custom/Get-AzScVmmVMGuestAgent.ps1        | 12 ++++++--
 .../ScVmm.Autorest/custom/New-AzScVmmVM.ps1   | 28 ++++++++++++++-----
 .../custom/New-AzScVmmVMCheckpoint.ps1        | 12 ++++++--
 .../custom/New-AzScVmmVMGuestAgent.ps1        | 11 +++++++-
 .../custom/Remove-AzScVmmVM.ps1               | 12 ++++++--
 .../custom/Remove-AzScVmmVMCheckpoint.ps1     | 11 ++++++--
 .../custom/Remove-AzScVmmVMDisk.ps1           | 10 +++----
 .../custom/Remove-AzScVmmVMNic.ps1            | 10 +++----
 .../custom/Restart-AzScVmmVM.ps1              | 11 ++++++--
 .../custom/Restore-AzScVmmVMCheckpoint.ps1    | 11 ++++++--
 .../ScVmm.Autorest/custom/Start-AzScVmmVM.ps1 | 11 ++++++--
 .../ScVmm.Autorest/custom/Stop-AzScVmmVM.ps1  | 11 ++++++--
 .../custom/Update-AzScVmmVM.ps1               | 12 ++++++--
 .../custom/Update-AzScVmmVMDisk.ps1           | 10 +++----
 .../custom/Update-AzScVmmVMNic.ps1            | 10 +++----
 src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md     | 12 ++++----
 .../docs/New-AzScVmmVMCheckpoint.md           |  4 +--
 .../docs/Update-AzScVmmAvailabilitySet.md     |  4 +--
 .../docs/Update-AzScVmmCloud.md               |  4 +--
 .../docs/Update-AzScVmmServer.md              |  4 +--
 .../docs/Update-AzScVmmVMNic.md               |  2 +-
 .../docs/Update-AzScVmmVMTemplate.md          |  4 +--
 .../docs/Update-AzScVmmVirtualNetwork.md      |  4 +--
 .../ScVmm/help/New-AzScVmmVMCheckpoint.md     |  4 +--
 .../help/Update-AzScVmmAvailabilitySet.md     |  4 +--
 src/ScVmm/ScVmm/help/Update-AzScVmmCloud.md   |  4 +--
 src/ScVmm/ScVmm/help/Update-AzScVmmServer.md  |  4 +--
 .../ScVmm/help/Update-AzScVmmVMTemplate.md    |  4 +--
 .../help/Update-AzScVmmVirtualNetwork.md      |  4 +--
 33 files changed, 181 insertions(+), 104 deletions(-)

diff --git a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
index f0de2d876313..17078cda6af8 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
@@ -253,23 +253,23 @@ function Add-AzScVmmVMDisk {
           }
           
           try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
               throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
           }
           catch {
-            throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
           }
 
           try {
-            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-            if ($null -eq $machineObj) {
+            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+            if ($null -eq $vmObj) {
               throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
index a95798a4d5a6..6f06377040e3 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
@@ -262,23 +262,23 @@ function Add-AzScVmmVMNic {
             }
             
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
   
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
                 throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newNicObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVM.ps1
index e2a1c5b2c587..a6b2efdf5855 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVM.ps1
@@ -143,9 +143,14 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
index 5ca288048b62..4735d370d100 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
@@ -70,23 +70,23 @@ function Get-AzScVmmVMDisk {
 
   process {
     try {
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
         if ($null -eq $machineObj) {
           throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
         }
       }
       catch {
-        throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
       }
 
       try {
-        $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-        if ($null -eq $machineObj) {
+        $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+        if ($null -eq $vmObj) {
           throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
         }
       }
       catch {
-        throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+        throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
       }
 
       $disks = $vmObj | Select-Object -ExpandProperty StorageProfileDisk
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMGuestAgent.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMGuestAgent.ps1
index b54891c0190f..1b86817c220b 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMGuestAgent.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMGuestAgent.ps1
@@ -143,10 +143,16 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         foreach ($key in @('Name', 'ResourceGroupName', 'SubscriptionId')) {
             [void]$PSBoundParameters.Remove($key)
diff --git a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVM.ps1
index b076a1ebca1c..34c8c7701599 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVM.ps1
@@ -516,7 +516,7 @@ begin {
         # Check if Hybrid Compute machine resource exists or create a new one
 
         try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
                 throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
@@ -538,18 +538,32 @@ begin {
                 if ($null -eq $Location) {
                     throw "The parent Machine resource does not exist. Location is required while creating a new machine."
                 }
-                if ($Tag) {
-                    $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -Location $Location -Tag $Tag -Kind $MACHINE_KIND_SCVMM
-                } else {
-                    $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -Location $Location -Kind $MACHINE_KIND_SCVMM
+                try {
+                    if ($Tag) {
+                        $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name `
+                            -ResourceGroupName $ResourceGroupName `
+                            -SubscriptionId $SubscriptionId `
+                            -Location $Location -Tag $Tag -Kind $MACHINE_KIND_SCVMM `
+                            -ErrorAction Stop
+                    }
+                    else {
+                        $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name `
+                            -ResourceGroupName $ResourceGroupName `
+                            -SubscriptionId $SubscriptionId `
+                            -Location $Location -Kind $MACHINE_KIND_SCVMM `
+                            -ErrorAction Stop
+                    }
+                }
+                catch {
+                    throw "Machine creation failed for VM '$Name'. Exception: $($_.Exception.Message)"
                 }
 
                 if ($null -eq $machineObj) {
-                    throw "Failed to create the machine resource for the new virtual machine."
+                    throw "Failed to create the machine resource for the new virtual machine '$Name'."
                 }
             }
             else {
-                throw $_
+                throw
             }
         }
 
diff --git a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMCheckpoint.ps1 b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMCheckpoint.ps1
index 687bf58a7eea..cc7754e4c8ca 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMCheckpoint.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMCheckpoint.ps1
@@ -187,10 +187,16 @@ begin {
 
         # Custom Logic Begin
         
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         foreach ($key in @('Name', 'ResourceGroupName', 'SubscriptionId')) {
             [void]$PSBoundParameters.Remove($key)
diff --git a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMGuestAgent.ps1 b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMGuestAgent.ps1
index 84cda9882357..a6b43c44ef02 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMGuestAgent.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMGuestAgent.ps1
@@ -187,7 +187,16 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
+        }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         if (($null -eq $machineObj.Identity) -or $machineObj.Identity.Type -ne 'SystemAssigned') {
             $machineObj = Az.ScVmm.internal\Update-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -IdentityType 'SystemAssigned'
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVM.ps1
index 21154f122a89..c0c932c5c1ff 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVM.ps1
@@ -212,10 +212,16 @@ begin {
         }
 
         # Fetch machine details
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
 
         if ($PSBoundParameters.ContainsKey('DeleteFromHost')) {
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMCheckpoint.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMCheckpoint.ps1
index 32aa650e5773..a4932c0e22f7 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMCheckpoint.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMCheckpoint.ps1
@@ -197,9 +197,14 @@ begin {
 
         # Custom Logic Begin
         
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
index 1a6ace06e38e..864953f17999 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
@@ -172,23 +172,23 @@ function Remove-AzScVmmVMDisk {
           }
 
           try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
               throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
           }
           catch {
-            throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
           }
 
           try {
-            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-            if ($null -eq $machineObj) {
+            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+            if ($null -eq $vmObj) {
               throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
index 7777b45c6ee1..39b3c8a1bb74 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
@@ -172,23 +172,23 @@ function Remove-AzScVmmVMNic {
             }
 
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
   
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
                 throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
             }
 
           if (-not $diskFound) {
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Restart-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Restart-AzScVmmVM.ps1
index 760cf2821209..326e6e91b7cc 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Restart-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Restart-AzScVmmVM.ps1
@@ -160,9 +160,14 @@ begin {
         }
         
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Restore-AzScVmmVMCheckpoint.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Restore-AzScVmmVMCheckpoint.ps1
index 74f1f9adb9e4..cd3a2d960f62 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Restore-AzScVmmVMCheckpoint.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Restore-AzScVmmVMCheckpoint.ps1
@@ -197,9 +197,14 @@ begin {
 
         # Custom Logic Begin
     
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Start-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Start-AzScVmmVM.ps1
index b83707c18c12..ec9c828e1a64 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Start-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Start-AzScVmmVM.ps1
@@ -160,9 +160,14 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Stop-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Stop-AzScVmmVM.ps1
index a50d54dc07f0..607b1d33e120 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Stop-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Stop-AzScVmmVM.ps1
@@ -200,9 +200,14 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
         
         $PSBoundParameters['MachineId'] = $machineObj.Id
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVM.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVM.ps1
index da1633d687cf..841d419ade0d 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVM.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVM.ps1
@@ -242,10 +242,16 @@ begin {
 
         # Check if Hybrid Compute machine resource exists or create a new one
 
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
         }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
+        }
+
         if ($Tag) {
             $machineObj = Az.ScVmm.internal\Update-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -Tag $Tag
             if ($null -eq $machineObj) {
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
index c60af9fd88d6..cd06c375e48e 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
@@ -216,23 +216,23 @@ function Update-AzScVmmVMDisk {
             }
             
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
   
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
                 throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
index a5536cec3cd6..e5d449d434d0 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
@@ -213,23 +213,23 @@ function Update-AzScVmmVMNic {
             }
 
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
   
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
                 throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newNicObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md b/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
index 9f7b8ac20a34..2dfe9dee3c49 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
@@ -79,7 +79,7 @@ The operation to create a virtual machine.
 Please note some properties can be set only during virtual machine creation.
 
 ### [New-AzScVmmVMCheckpoint](New-AzScVmmVMCheckpoint.md)
-create a checkpoint in virtual machine.
+Create a checkpoint in virtual machine.
 
 ### [New-AzScVmmVMExtension](New-AzScVmmVMExtension.md)
 The operation to create the extension on a virtual machine where Azure Arc agent is installed.
@@ -133,16 +133,16 @@ The operation to start a virtual machine.
 The operation to power off (stop) a virtual machine.
 
 ### [Update-AzScVmmAvailabilitySet](Update-AzScVmmAvailabilitySet.md)
-update the AvailabilitySets resource.
+Update the AvailabilitySets resource.
 
 ### [Update-AzScVmmCloud](Update-AzScVmmCloud.md)
-update the Clouds resource.
+Update the Clouds resource.
 
 ### [Update-AzScVmmServer](Update-AzScVmmServer.md)
-update the VmmServers resource.
+Update the VmmServers resource.
 
 ### [Update-AzScVmmVirtualNetwork](Update-AzScVmmVirtualNetwork.md)
-update the VirtualNetworks resource.
+Update the VirtualNetworks resource.
 
 ### [Update-AzScVmmVM](Update-AzScVmmVM.md)
 The operation to update a virtual machine (Use separate commands for NIC and Disk update on virtual Machine).
@@ -157,5 +157,5 @@ The operation to update the extension.
 The operation to Update a virtual machine network interface.
 
 ### [Update-AzScVmmVMTemplate](Update-AzScVmmVMTemplate.md)
-update the VirtualMachineTemplate resource.
+Update the VirtualMachineTemplate resource.
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/New-AzScVmmVMCheckpoint.md b/src/ScVmm/ScVmm.Autorest/docs/New-AzScVmmVMCheckpoint.md
index 40522b984cf3..c61ed2bfabe7 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/New-AzScVmmVMCheckpoint.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/New-AzScVmmVMCheckpoint.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # New-AzScVmmVMCheckpoint
 
 ## SYNOPSIS
-create a checkpoint in virtual machine.
+Create a checkpoint in virtual machine.
 
 ## SYNTAX
 
@@ -34,7 +34,7 @@ New-AzScVmmVMCheckpoint -Name <String> -ResourceGroupName <String> -JsonString <
 ```
 
 ## DESCRIPTION
-create a checkpoint in virtual machine.
+Create a checkpoint in virtual machine.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmAvailabilitySet.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmAvailabilitySet.md
index adf41c4ba1d3..70a1ea529c66 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmAvailabilitySet.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmAvailabilitySet.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmAvailabilitySet
 
 ## SYNOPSIS
-update the AvailabilitySets resource.
+Update the AvailabilitySets resource.
 
 ## SYNTAX
 
@@ -39,7 +39,7 @@ Update-AzScVmmAvailabilitySet -Name <String> -ResourceGroupName <String> -JsonSt
 ```
 
 ## DESCRIPTION
-update the AvailabilitySets resource.
+Update the AvailabilitySets resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmCloud.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmCloud.md
index b0394224db48..6ebcad49e603 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmCloud.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmCloud.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmCloud
 
 ## SYNOPSIS
-update the Clouds resource.
+Update the Clouds resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmCloud -Name <String> -ResourceGroupName <String> -JsonString <Stri
 ```
 
 ## DESCRIPTION
-update the Clouds resource.
+Update the Clouds resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmServer.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmServer.md
index cec949794f63..0f6f44f818f2 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmServer.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmServer.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmServer
 
 ## SYNOPSIS
-update the VmmServers resource.
+Update the VmmServers resource.
 
 ## SYNTAX
 
@@ -39,7 +39,7 @@ Update-AzScVmmServer -Name <String> -ResourceGroupName <String> -JsonString <Str
 ```
 
 ## DESCRIPTION
-update the VmmServers resource.
+Update the VmmServers resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMNic.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMNic.md
index 04e0c8540137..9dbb7c826272 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMNic.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMNic.md
@@ -113,7 +113,7 @@ Type                                       : microsoft.scvmm/virtualmachineinsta
 ```
 
 Update Network Interface of the SCVMM Virtual Machine.
-It might take some time to sync the MacAdders and Ipv4Address in the response.
+It might take some time to sync the MacAddress and Ipv4Address in the response.
 Use `Get-AzScVmmVM` command to fetch the latest configuration of the virtual machine.
 
 ## PARAMETERS
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMTemplate.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMTemplate.md
index 02ed30865090..bccd7aed2752 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMTemplate.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVMTemplate.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmVMTemplate
 
 ## SYNOPSIS
-update the VirtualMachineTemplate resource.
+Update the VirtualMachineTemplate resource.
 
 ## SYNTAX
 
@@ -39,7 +39,7 @@ Update-AzScVmmVMTemplate -Name <String> -ResourceGroupName <String> -JsonString
 ```
 
 ## DESCRIPTION
-update the VirtualMachineTemplate resource.
+Update the VirtualMachineTemplate resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVirtualNetwork.md b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVirtualNetwork.md
index d68fd4f2b8d5..5832568e1088 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVirtualNetwork.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Update-AzScVmmVirtualNetwork.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmVirtualNetwork
 
 ## SYNOPSIS
-update the VirtualNetworks resource.
+Update the VirtualNetworks resource.
 
 ## SYNTAX
 
@@ -39,7 +39,7 @@ Update-AzScVmmVirtualNetwork -Name <String> -ResourceGroupName <String> -JsonStr
 ```
 
 ## DESCRIPTION
-update the VirtualNetworks resource.
+Update the VirtualNetworks resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/New-AzScVmmVMCheckpoint.md b/src/ScVmm/ScVmm/help/New-AzScVmmVMCheckpoint.md
index 0dbf02d09d53..2ed53c4447d9 100644
--- a/src/ScVmm/ScVmm/help/New-AzScVmmVMCheckpoint.md
+++ b/src/ScVmm/ScVmm/help/New-AzScVmmVMCheckpoint.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # New-AzScVmmVMCheckpoint
 
 ## SYNOPSIS
-create a checkpoint in virtual machine.
+Create a checkpoint in virtual machine.
 
 ## SYNTAX
 
@@ -34,7 +34,7 @@ New-AzScVmmVMCheckpoint -Name <String> -ResourceGroupName <String> [-Subscriptio
 ```
 
 ## DESCRIPTION
-create a checkpoint in virtual machine.
+Create a checkpoint in virtual machine.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/Update-AzScVmmAvailabilitySet.md b/src/ScVmm/ScVmm/help/Update-AzScVmmAvailabilitySet.md
index e9f4ea60f521..56315377cd5d 100644
--- a/src/ScVmm/ScVmm/help/Update-AzScVmmAvailabilitySet.md
+++ b/src/ScVmm/ScVmm/help/Update-AzScVmmAvailabilitySet.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmAvailabilitySet
 
 ## SYNOPSIS
-update the AvailabilitySets resource.
+Update the AvailabilitySets resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmAvailabilitySet -InputObject <IScVmmIdentity> [-Tag <Hashtable>] [
 ```
 
 ## DESCRIPTION
-update the AvailabilitySets resource.
+Update the AvailabilitySets resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/Update-AzScVmmCloud.md b/src/ScVmm/ScVmm/help/Update-AzScVmmCloud.md
index 7e05e7b38c36..b74631b8f308 100644
--- a/src/ScVmm/ScVmm/help/Update-AzScVmmCloud.md
+++ b/src/ScVmm/ScVmm/help/Update-AzScVmmCloud.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmCloud
 
 ## SYNOPSIS
-update the Clouds resource.
+Update the Clouds resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmCloud -InputObject <IScVmmIdentity> [-Tag <Hashtable>] [-DefaultPr
 ```
 
 ## DESCRIPTION
-update the Clouds resource.
+Update the Clouds resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/Update-AzScVmmServer.md b/src/ScVmm/ScVmm/help/Update-AzScVmmServer.md
index 32848fd10d71..a1967b9e7040 100644
--- a/src/ScVmm/ScVmm/help/Update-AzScVmmServer.md
+++ b/src/ScVmm/ScVmm/help/Update-AzScVmmServer.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmServer
 
 ## SYNOPSIS
-update the VmmServers resource.
+Update the VmmServers resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmServer -InputObject <IScVmmIdentity> [-Tag <Hashtable>] [-DefaultP
 ```
 
 ## DESCRIPTION
-update the VmmServers resource.
+Update the VmmServers resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/Update-AzScVmmVMTemplate.md b/src/ScVmm/ScVmm/help/Update-AzScVmmVMTemplate.md
index 4b6062793bc0..d1552aaaaf38 100644
--- a/src/ScVmm/ScVmm/help/Update-AzScVmmVMTemplate.md
+++ b/src/ScVmm/ScVmm/help/Update-AzScVmmVMTemplate.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmVMTemplate
 
 ## SYNOPSIS
-update the VirtualMachineTemplate resource.
+Update the VirtualMachineTemplate resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmVMTemplate -InputObject <IScVmmIdentity> [-Tag <Hashtable>] [-Defa
 ```
 
 ## DESCRIPTION
-update the VirtualMachineTemplate resource.
+Update the VirtualMachineTemplate resource.
 
 ## EXAMPLES
 
diff --git a/src/ScVmm/ScVmm/help/Update-AzScVmmVirtualNetwork.md b/src/ScVmm/ScVmm/help/Update-AzScVmmVirtualNetwork.md
index 05391bd62af0..36f63ebcd869 100644
--- a/src/ScVmm/ScVmm/help/Update-AzScVmmVirtualNetwork.md
+++ b/src/ScVmm/ScVmm/help/Update-AzScVmmVirtualNetwork.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzScVmmVirtualNetwork
 
 ## SYNOPSIS
-update the VirtualNetworks resource.
+Update the VirtualNetworks resource.
 
 ## SYNTAX
 
@@ -38,7 +38,7 @@ Update-AzScVmmVirtualNetwork -InputObject <IScVmmIdentity> [-Tag <Hashtable>] [-
 ```
 
 ## DESCRIPTION
-update the VirtualNetworks resource.
+Update the VirtualNetworks resource.
 
 ## EXAMPLES
 

From f46a2f73a1ee843c2fab249c691405ea9efcc6f7 Mon Sep 17 00:00:00 2001
From: Harshit Surana <hsurana@microsoft.com>
Date: Mon, 1 Sep 2025 23:38:00 +0530
Subject: [PATCH 2/4] Update changelog

---
 src/ScVmm/ScVmm/ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ScVmm/ScVmm/ChangeLog.md b/src/ScVmm/ScVmm/ChangeLog.md
index 8f55cb0c00f2..c671a60ca778 100644
--- a/src/ScVmm/ScVmm/ChangeLog.md
+++ b/src/ScVmm/ScVmm/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Suppressed expected MachineResourceNotFound exceptions from being printed on the console.
 
 ## Version 0.1.0
 * First preview release for module Az.ScVmm

From cebf3a6a5a26bf296072acf955f3ed441693610f Mon Sep 17 00:00:00 2001
From: Harshit Surana <hsurana@microsoft.com>
Date: Mon, 1 Sep 2025 23:56:46 +0530
Subject: [PATCH 3/4] Update exception message

---
 src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1    | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1     | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1    | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1     | 8 ++++----
 src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1 | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1  | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1 | 4 ++--
 src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1  | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
index 17078cda6af8..1fc840d80ccf 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1
@@ -265,11 +265,11 @@ function Add-AzScVmmVMDisk {
           try {
             $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
             if ($null -eq $vmObj) {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+            throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
index 6f06377040e3..e1de3bcea19d 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1
@@ -274,11 +274,11 @@ function Add-AzScVmmVMNic {
             try {
               $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
               if ($null -eq $vmObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newNicObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
index 4735d370d100..9db0b871c9af 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1
@@ -82,11 +82,11 @@ function Get-AzScVmmVMDisk {
       try {
         $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
         if ($null -eq $vmObj) {
-          throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+          throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
         }
       }
       catch {
-        throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+        throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
       }
 
       $disks = $vmObj | Select-Object -ExpandProperty StorageProfileDisk
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1
index 6f0758b52eb9..52bc3947fb0f 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1
@@ -76,17 +76,17 @@ function Get-AzScVmmVMNic {
       }
     }
     catch {
-      throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+      throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId). Exception: $($_.Exception.Message)"
     }
 
     try {
       $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-      if ($null -eq $machineObj) {
-        throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+      if ($null -eq $vmObj) {
+        throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
       }
     }
     catch {
-      throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+      throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
     }
 
     $nics = $vmObj | Select-Object -ExpandProperty NetworkProfileNetworkInterface
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
index 864953f17999..1c0fa201b1cd 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1
@@ -184,11 +184,11 @@ function Remove-AzScVmmVMDisk {
           try {
             $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
             if ($null -eq $vmObj) {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+            throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
index 39b3c8a1bb74..10d8a5e013c9 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1
@@ -184,11 +184,11 @@ function Remove-AzScVmmVMNic {
             try {
               $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
               if ($null -eq $vmObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
 
           if (-not $diskFound) {
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
index cd06c375e48e..ffffb695e7b2 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMDisk.ps1
@@ -228,11 +228,11 @@ function Update-AzScVmmVMDisk {
             try {
               $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
               if ($null -eq $vmObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newDiskObject = @()
diff --git a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1 b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
index e5d449d434d0..13c2ac410780 100644
--- a/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
+++ b/src/ScVmm/ScVmm.Autorest/custom/Update-AzScVmmVMNic.ps1
@@ -225,11 +225,11 @@ function Update-AzScVmmVMNic {
             try {
               $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
               if ($null -eq $vmObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for VM '$vmName'. Exception: $($_.Exception.Message)"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
   
             $newNicObject = @()

From 017e1d39e9405a0d41f77b3771e0bf702cc7e42d Mon Sep 17 00:00:00 2001
From: Harshit Surana <hsurana@microsoft.com>
Date: Tue, 2 Sep 2025 12:02:03 +0530
Subject: [PATCH 4/4] Build config changes

---
 src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md   |  2 +-
 src/ScVmm/ScVmm.Autorest/generate-info.json |  2 +-
 src/ScVmm/ScVmm.sln                         | 10 +++++-----
 src/ScVmm/ScVmm/Az.ScVmm.psd1               |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md b/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
index 2dfe9dee3c49..549be71b70ad 100644
--- a/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
+++ b/src/ScVmm/ScVmm.Autorest/docs/Az.ScVmm.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.ScVmm
-Module Guid: 6bbd0115-d0f5-41c8-b572-83ba7ff1dacc
+Module Guid: 968cc7e1-fefa-4096-9962-9baad09116d9
 Download Help Link: https://learn.microsoft.com/powershell/module/az.scvmm
 Help Version: 1.0.0.0
 Locale: en-US
diff --git a/src/ScVmm/ScVmm.Autorest/generate-info.json b/src/ScVmm/ScVmm.Autorest/generate-info.json
index df372acab231..0e85df2ccc06 100644
--- a/src/ScVmm/ScVmm.Autorest/generate-info.json
+++ b/src/ScVmm/ScVmm.Autorest/generate-info.json
@@ -1,3 +1,3 @@
 {
-  "generate_Id": "2e00b7d3-20cc-4d79-9637-d046d7720a57"
+  "generate_Id": "16a2b4a2-4cb6-4cde-ac54-a8a255677b2c"
 }
diff --git a/src/ScVmm/ScVmm.sln b/src/ScVmm/ScVmm.sln
index ccf39011ed8b..37cafd051a87 100644
--- a/src/ScVmm/ScVmm.sln
+++ b/src/ScVmm/ScVmm.sln
@@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accoun
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScVmm", "ScVmm\ScVmm.csproj", "{8F1EBE02-A595-4A87-9672-C332B3DBB508}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ScVmm", "ScVmm.Autorest\Az.ScVmm.csproj", "{52825CC6-7E06-4022-9011-0F62EB9660F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ScVmm", "ScVmm.Autorest\Az.ScVmm.csproj", "{DF6C4C69-9B7A-4384-8AD6-1170B27CC743}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -58,10 +58,10 @@ Global
 		{8F1EBE02-A595-4A87-9672-C332B3DBB508}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F1EBE02-A595-4A87-9672-C332B3DBB508}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F1EBE02-A595-4A87-9672-C332B3DBB508}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52825CC6-7E06-4022-9011-0F62EB9660F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52825CC6-7E06-4022-9011-0F62EB9660F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52825CC6-7E06-4022-9011-0F62EB9660F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52825CC6-7E06-4022-9011-0F62EB9660F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF6C4C69-9B7A-4384-8AD6-1170B27CC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF6C4C69-9B7A-4384-8AD6-1170B27CC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF6C4C69-9B7A-4384-8AD6-1170B27CC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF6C4C69-9B7A-4384-8AD6-1170B27CC743}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D6AED500-9C33-4433-B3CA-7ED0378E2D5F} = {BA575CE4-A31F-490C-894B-58430EA1CF10}
diff --git a/src/ScVmm/ScVmm/Az.ScVmm.psd1 b/src/ScVmm/ScVmm/Az.ScVmm.psd1
index 6b166aeb8fe2..6cb258b9a2af 100644
--- a/src/ScVmm/ScVmm/Az.ScVmm.psd1
+++ b/src/ScVmm/ScVmm/Az.ScVmm.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/7/2025
+# Generated on: 9/2/2025
 #
 
 @{
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '4.2.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'ScVmm.Autorest/bin/Az.ScVmm.private.dll'