AI code review identified several occasions where invalid references to
stale objects could stick around, leading to panics at runtime. This
commit corrects the identified issues.