added try catch
Merge branch 'master' of github.com:pcookson/cs3307