SOS-1790 Ensure extra data is not null