Updated logging to stay consistent, even if it means accepting some
badly formulated messages.