Fix error code references containg "@"