Update the line number for a couple cppcheck suppressions and add one for the pool variable in the vvp directory. Also move a check for null to the correct place.