Try catch added into server
Merge pull request #303 from HoltMaki/master

Try catch added into server