Removed some null checks.