Fix handling of missing --servername