diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor
index cac4180abd..912cd48c79 100644
--- a/extra/mason/common/common.factor
+++ b/extra/mason/common/common.factor
@@ -8,8 +8,10 @@ calendar.format arrays mason.config locals debugger fry
 continuations strings io.sockets ;
 IN: mason.common
 
+ERROR: no-host-name ;
+
 : short-host-name ( -- string )
-    host-name "." split1 drop ;
+    host-name "." split1 drop [ no-host-name ] unless* ;
 
 SYMBOL: current-git-id