Added handling for JSON 'null' values