Fixed multiple error messages