[ros-diffs] [tretiakov] 22236: add missing check for null return