Added error handling gems