Added error handling impl