Added error handling
Removed response error handling, should be handled by calling class
Error handling