[RJA-2907][fix] - Handling nulls correctly