keep up with api changes
change error handling to reflect changes in the API implementation