Bug correction : verify some empty or not data  before setting field

Bug correction : verify some empty or not data  before setting field