Refactored check Location to catch Exceptions
Merge branch 'master' of https://github.com/boniface/mshengu.git