Merge "Fix missing variable in HTMLFormField exceptions"