Fixed try/catch
Merge pull request #164 from jaytaph/trycatch

Fixed try/catch