Improve error message based on merge request review.