Issue #71 and #15 - changed empty list problem and replace null with the requested object (all fields are unset)