diff --git a/confluent_server/confluent/selfservice.py b/confluent_server/confluent/selfservice.py
index 15687d21..ac7501c7 100644
--- a/confluent_server/confluent/selfservice.py
+++ b/confluent_server/confluent/selfservice.py
@@ -33,7 +33,7 @@ def get_extra_names(nodename, cfg):
                 currnames = currnames.split(',')
                 for currname in currnames:
                     names.add(currname)
-                    if domain not in currname:
+                    if domain and domain not in currname:
                         names.add('{0}.{1}'.format(currname, domain))
     return names