Removed debug message
Added defer recover to sender checking