Prevent send task from swallowing exception
Merge remote-tracking branch 'upstream/master' into HEAD