diff --git a/lib/ssh.py b/lib/ssh.py
index e87b19da70a640c413c82078500e3fd8775f41d5..40df9996500dd1228399f37b89366bed03a27202 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -219,6 +219,9 @@ class SshRunner:
       output = retval.output
       if output:
         msg += ": %s" % output
+      else:
+        msg += ": %s (no output)" % retval.fail_reason
+      logging.error("Command %s failed: %s" % (retval.cmd, msg))
       return False, msg
 
     remotehostname = retval.stdout.strip()