Removing null data check - this broke IE8 compatibility possibly