Exclude attachment refs that err
Merge branch 'fix/exclude-erroring-attachmentrefs'

* fix/exclude-erroring-attachmentrefs:
  Exclude attachment refs that err