#MLHR-669 fix the not null bug