Fix issue with null property