Fix null handling in JSON files