improve messages and fix #1011