diff --git a/reclient_helper.py b/reclient_helper.py
index ddeb403c57..2b99707e61 100644
--- a/reclient_helper.py
+++ b/reclient_helper.py
@@ -125,7 +125,10 @@ def get_hostname():
     hostname = socket.gethostname()
     try:
         return socket.gethostbyaddr(hostname)[0]
-    except socket.gaierror:
+    except Exception as e:
+        print("socket.gethostbyaddr failed " +
+                "(falling back to socket.gethostname): %s" % e,
+                file=sys.stderr)
         return hostname