Fixed missing try/catches
Merge pull request #34 from Shukaro/master

Fixed try/catches