[CLOUD-37] Better error reporting