Fix NPE if incoming SEND
Fixes based on lint