Hotfix: added check for null data