Fix for mysterious 'anonymous sender' NPE.