Removed redundant null check