Fixes NB#132390, added a couple of extra checks to prevent invalid dereferences