Added a better exception handler.
Merge branch 'master' of github.com:BlockServerProject/BlockServer