Merge "Handling for occassional npe in neutron-mapper/vpp-renderer"