cppcheck cleanup: fix nullPointer errors