Remove assumptions from sender

I was relying on an assumption the sender would always have a
discussions object. This removes that assumption and updates some other
minor related issues.