Removed isnull check