Handle more cases by lazily checking missing attribute names