[ros-diffs] [janderwald] 28819: - improve error checking