Changing some hardcoded error messages