Changed error handling when calling client API to catch the new staging
related exceptions.