Allowing NULL as generic data value, refs #8