Fix conditions. Improve message.