CNS-536: Warning message is added many times