[ros-diffs] [janderwald] 44437: Return correct error code