More null checks for attachments.

Change-Id: Ib9e545793e44a822bf8c746ada6b27decc6323d7
2 files changed