[ros-diffs] [janderwald] 39438: - Add more error checks