Re #783 Checking null values.