Fixed more inconsistencies with the error messages.