Reorganized order of error messages