diff --git a/powerwall.sh b/powerwall.sh
index 1f32f898..b85b34f8 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -476,8 +476,10 @@ HOSTMGMT(){
 	echo -e "\n${idsCL[Yellow]}Host Controls${idsCL[Default]}"
 	DIVIDER . yellow 75
 	
-	if [ "${1}" != "-h" ]; then
-		HOST=${1}; MN=0
+	HOST=${1}
+	if [ "${HOST}" != "-h" ] && [ "${HOST}" != "" ]; then
+		cHOST=${HOST}
+		MN=0
 		if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
 			tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
 			ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
@@ -489,7 +491,7 @@ HOSTMGMT(){
 			ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}
 		elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}
-		elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then
+		elif [ "${HOST^^}" == "ALL" ] || [ "${HOST^^}" == "MAINSITE" ] || [ "${HOST^^}" == "OFFSITE" ] || [ "${HOST^^}" == "MAIN" ] || [ "${HOST^^}" == "SYS" ]; then
 			ESXI_HOST=${HOST^^}
 			MN=1
 		else
@@ -513,13 +515,14 @@ HOSTMGMT(){
 			idracip=${PW_HOST_IDRACS[${tmp}]}
 			hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
 		fi
+	else
+		cHOST='-help'
 	fi
-	
 	while [ $# -gt 0 ]; do
-		case "$1" in
+		case "${cHOST}" in
 			-p|-power) POWER=${2}; MODE="power";;
 			-e|-esxi) ESXI=${2}; MODE="esxi";;
-			-h)
+			-h|-help)
 				echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {"
 				width=35
 				printf "%-${width}s- %s\n" "    {host}" "(*required, can either be esxiIP,idracIP or Host#)"