Extra sanity check, don't assume who is not set to None

Ticket: #3667