Replaced bad try {} catch with if {} sentences
Merge branch 'master' of https://github.com/Evernest/Evernest