Merge "Fix NPE in logging"