[ros-diffs] [cwittich] 43555: add some NULL checks