[ros-diffs] [greatlrd] 16588: last try to fix NULL bug