Fix the error message being shown to the user

Reviewer: Tiff Go (post commit)

Issue: GCP-9621