Add null check on Row for join properties