Improve messages. Closes #3370.