More work on dealing with null value correctly