diff --git a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
index e3cf357a..146bb1c6 100755
--- a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
+++ b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
@@ -3,8 +3,7 @@
 # Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
 . /opt/idssys/powerwall/settings.ps1
 
-# $ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
 # $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM
 #
@@ -15,12 +14,16 @@ $ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -P
 # }
 
 Do {
-	$poff = 'yes'
+	$poff = 'no'
 	$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM
-	Foreach ($VM in $VMLIST) { 
-		if ((Get-VM $VM).PowerState -match 'PoweredOn') {
-	        $poff = 'no'
-	    }
+	if ($VMLIST -notmatch '') {
+		Foreach ($VM in $VMLIST) { 
+			if ((Get-VM $VM).PowerState -notmatch 'PoweredOn') {
+		        $poff = 'yes'
+		    }
+		}
+	} else {
+		$poff = 'yes'
 	}
 } Until ($poff -match 'yes')