Fixes NB#126941 fixes some potential invalid dereference issues