Merge "Fix error message formatting" into main