Fix error messages
Reviewer: Dan Jao
Issue: GCP-8810  and error message in import