Refined error-handling of cloud targets