Fix exceptions in Cloud command