Add null check,if null change to "no data"