tweak error messages
fix #2