[ros-diffs] [cwittich] 39442: fix NULL checks