bug fix:Data Null handling