* add null handling * replaced hashmaps with immutable map in deserializer returns * added simple test for previously failing case