I am going to double check if this is really required, but this made sense to me. Previously, an exception would trigger the cleanup of the group anyway. So this more or less had the same effect.