Fix error message issue