Fixes a couple of use-after free found when looking into #1324
Marking as draft as unsure if those are actually valid wrt. present.
/cc @daenzer
