[ros-diffs] [cgutman] 41590: - Fix the order of checks