Corrected the pointer swizzling to be +1 so that null pointers can be
accounted for.