--- a/pvl/hosts/host.py	Thu Feb 26 16:37:24 2015 +0200
+++ b/pvl/hosts/host.py	Thu Feb 26 16:38:31 2015 +0200
@@ -202,4 +202,6 @@
             return pvl.dns.fqdn(self.name)
     
     def __str__ (self):
-        return "{self.name}@{self.domain}".format(self=self)
+        return "{self.name}@{domain}".format(self=self,
+                domain      = self.domain or '',
+        )