Add check for nil servers