Merge "Make sure the icon of the sender isn't null"