Follow up b074a82325a7cb58454e3ffc4d6ceacdb4a18148

Moved type check into the sender methods.