Fixed friendly error messages