It is used in next error.

OK for an incremental patch fixing both at once ?