140408-iss005: modify error messages