add check for null data from XSP3