Leak around return

[savdoc2]

Thanks!

We will try to double patch it - the second patch slightly bigger than the first.