Updated JSONEvent to handle nulls