Improve robustness of handling of undefined attrs.