Catch AttributeError exception if getattr fails
Merge remote-tracking branch 'origin/strip-fields'