diff --git a/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1 b/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
index 053d1f6..ed97a24 100644
--- a/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
+++ b/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
@@ -6604,10 +6604,6 @@ function Get-HVMachineSummary {
   }
 
   $machineList = Find-HVMachine -Param $PSBoundParameters
-  if (!$machineList) {
-    Write-Host "No Virtual Machine(s) Found with given search parameters"
-    break
-  }
   return $machineList
 }
 
diff --git a/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1 b/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1
index 5252f96..c350955 100644
--- a/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1
+++ b/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1
@@ -274,7 +274,7 @@ Function Set-vMotionEncryptionConfig {
         [Parameter(Mandatory=$True,ValueFromPipeline=$True,ValueFromPipelinebyPropertyName=$True)]
         [VMware.VimAutomation.ViCore.Types.V1.Inventory.VirtualMachine]$VM,
 
-        [Parameter(Mandatory=$True]
+        [Parameter(Mandatory=$True)]
         [ValidateSet("disabled", "opportunistic", "required")]
         [String]$Encryption
     )
diff --git a/Scripts/NVME Info.ps1 b/Scripts/NVME Info.ps1
new file mode 100644
index 0000000..415b298
--- /dev/null
+++ b/Scripts/NVME Info.ps1	
@@ -0,0 +1,27 @@
+<#
+    .NOTES
+    ===========================================================================
+	 Created by:   	Alan Renouf
+     Organization: 	VMware
+     Blog:          http://virtu-al.net
+     Twitter:       @alanrenouf
+	===========================================================================
+#>
+
+Foreach ($vmhost in Get-VMHost) {
+    $esxcli = get-esxcli -V2 -vmhost $vmhost
+    Write-Host "Host: $($vmhost.name)" -ForegroundColor Green
+    $devices = $esxcli.nvme.device.list.Invoke()
+    Foreach ($device in $devices) {
+        $nvmedevice = $esxcli.nvme.device.get.CreateArgs()
+        $nvmedevice.adapter = $device.HBAName
+        $esxcli.nvme.device.get.invoke($nvmedevice) | Select-Object ModelNumber, FirmwareRevision
+        $features = $esxcli.nvme.device.feature.ChildElements | Select-object -ExpandProperty name
+        ForEach ($feature in $features){
+            Write-Host "Feature: $feature" -ForegroundColor Yellow
+            $currentfeature = $esxcli.nvme.device.feature.$feature.get.CreateArgs()
+            $currentfeature.adapter = $device.HBAName
+            $esxcli.nvme.device.feature.$feature.get.Invoke($currentfeature)    
+        }
+    }
+}
\ No newline at end of file