395 null sender stays null

Fixes #395.