Fix message content sometimes appearing in the log