Add minor exception handling
Merge branch 'master' of https://github.com/5outh/BeFun