TDI-31436:improve the warning message.