Be more correct in error messages

Authored by schwarzer on Jan 10 2018, 8:57 PM.