Changed entity_assemble_data() to change 'null' string values to null.