Bugfixing

Handling of servers that do not yet exist.