Handle missing attributes
Merge branch 'r1868-handle-missing-attributes' into campanja