Merge "Fix null check in invocation logging"