Fixing for some issues for nil data.