Merge pull request #15 from opi99/master

Bug #20025: Use null to differenciate between not set or empty.