Should we be marshalling $data if it is null/empty?