Remove warning when not needed and make the message more clear.