Cope better with missing attributes.
Merge bug25703