Improve cloudControl error handling