[ros-diffs] [mnordell] 29522: Prevent SEGV