[ros-diffs] [cgutman] 36185: - Fix a possible crash