Fix error messages

see #134