Improve rollback on failure of snapshot creation