Better handling of deleted machiens.