Better "animal not found" handling