Fix error message for duplicate PSMR and names
GCP-8905
To be reviewed by Aldrin