Final
error message fix on edit view