Added try catch
Merge branch 'master' of https://github.com/sunian/smash