diff --git a/supervisor.py b/supervisor.py
index 48d4089..4b7c000 100644
--- a/supervisor.py
+++ b/supervisor.py
@@ -122,7 +122,8 @@ def run(expe_file):
 
 def create_report(experience, stime=None, etime=None):
     expe_report = OrderedDict()
-    expe_report['supervisor'] = os.environ["HOST"]
+    host = os.getenv("HOST")
+    expe_report['supervisor'] = host if host is not None else os.uname()[1]
 
     # Dates
     for datek, timev in zip(('start_date', 'end_date'), (stime, etime)):