Make missing attribute management more robust