Added Null Sender Check