[ros-diffs] [weiden] 27985: Handle error case more correctly