Adding validation while updating see  BT#8689