DC21-498: change WARN and ERROR messages