Added checks and more robust breed-name-picking.