Provide an option to not cleanup on donation fails, so to be able to ret...

Provide an option to not cleanup on donation fails, so to be able to retrieve error messages about the donation