[ros-diffs] [cgutman] 37029: - Add another validity check