Set needNullHandling to false only in case of custom generator and true otherwise
Merge pull request #165 from cponomaryov/master

Set needNullHandling to false only in case of custom generator and true otherwise