MARI-17 updated not to serialize nulls