make cloudcare more resilient to submission errors