Add test and check for null, to stop null datapoints failing in message creation