Fixed problem with null data