Fixed issue with null data