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

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