fixed some errors

+ wrong try and catch fixed lol
Merge pull request #110 from Peda1996/master

fixed some errors