diff --git a/tripleo_common/utils/config.py b/tripleo_common/utils/config.py
index 129b16cfd..8eb0f7054 100644
--- a/tripleo_common/utils/config.py
+++ b/tripleo_common/utils/config.py
@@ -50,7 +50,8 @@ class Config(object):
                 for idx, name in enumerate(shortnames):
                     if 'server_ids' in role_node_id_map:
                         server_id = role_node_id_map['server_ids'][role][idx]
-                        servers[server_id] = name.lower()
+                        if server_id is not None:
+                            servers[server_id] = name.lower()
         return servers
 
     def get_deployment_data(self, stack,