Catch errors on send
Merge pull request #7 from clehner/master

Catch errors on send