Handle the improved error handling in CloudClient.

Mocking the behavior of an internal api inside another gem is a big no-no.