Handled null data
sync with master