Merge "Add missing nullptr checks for data.readCString() strings"