Null view holder bug fix