Fixed error messages to be parsed correctly with values