- removed unneeded/wrong message
- don't show the same message twice