Adding not null test to avoid data erasing while importing client data