added error handling
Merge branch 'master' of https://github.com/mqsiuser/use-the-tree