#6193 and fix for typo in one of error messages