Merge "Update error messages" into main