diff --git a/web/ssh-remove-known-host b/web/ssh-remove-known-host
index 723f7e4..77d847a 100755
--- a/web/ssh-remove-known-host
+++ b/web/ssh-remove-known-host
@@ -14,19 +14,23 @@ for (( i=1; i<=$#; i++ )); do
 done
 [[ -z "$HOST" ]] && helpexit
 
-HOST=$( ssh -G "$HOST" | awk '/^hostname / { print $2 }' )
-IP=$( getent hosts "$HOST" | awk '{ print $1 }' )
+REALHOST=$( ssh -G "$HOST" 2> /dev/null | awk '/^hostname / { print $2 }' )
+[[ -z "$REALHOST" ]] && REALHOST="$HOST"
+IP=$( getent hosts "$REALHOST" | awk '{ print $1 }' )
 
 [[ "$FORCE" -ne 1 ]] && {
-  echo "Sure to remove $HOST (IP: $IP) from known_hosts? [y/N]"
+  echo "Sure to remove ${REALHOST} (IP: ${IP}) from known_hosts? [y/N]"
   read resp
 } || {
   resp=y
 }
 
 [[ "$resp" = "y" ]] && {
-  set -x
-  ssh-keygen -R "$HOST"
-  ssh-keygen -R "$IP"
+  echo ssh-keygen -R "$REALHOST"
+  ssh-keygen -R "$REALHOST"
+  [[ -n "$IP" ]] && {
+    echo ssh-keygen -R "$IP"
+    ssh-keygen -R "$IP"
+  }
 }