Removed null check, as it broke project