Merge "Fix leak/crash in exit"