Handling missing slaves more elegantly.