updated function name
* added better error handling gems
* updated function name
Merge branch 'errorh'