Merge "Provide more informative error messages when rejecting updates"