Check for additionalFields null value fixes #39