Merge pull request #2158 from Sleaker/master

Resolves Vanilla-227
Exception hardending for the NetworkSendThread