Improving the error handling
Merge branch 'master' of https://github.com/chuz007/IHCTEAM