Fixes a potential client thread death by catching exceptions properly
Merge branch 'master' of github.com:datalurkur/Bushido-Mongers