Fixed client tasks so that cancellation doesn't emit an exception