Correct error handling for api calls
Correct error handling for api calls

shiftkey/desktop,shiftkey/desktop,desktop/desktop,shiftkey/desktop,desktop/desktop,shiftkey/desktop,desktop/desktop,desktop/desktop