[Bug]added error handling for api calls (#408) (#409)

[Bug]added error handling for api calls (#408) (#409) #637