fixed crashing issues with null data