CLC-2310 Fix null-exception-in-log-message timebomb