This fixes #8078.  It now adds an error message in the label field if there is an error.