[ros-diffs] [gvg] 21766: Add some checking