fixup! correctly handle null values and nested objects