inline cleanup call around so it will be called in the right order, and
be called on errors.

Per report from Tokuharu Yuzawa.