[ros-diffs] [cwittich] 28092: fix null pointer check