Fixed incorrect serializing/parsing of null values