more nullptr update