[ros-diffs] [janderwald] 32121: - insert new entry when required - check for null