Failsafe added for sender