Make sure that toJSON does NULL=>null