Merge "NBLog: Add checks for possible nullptr dereference"