Removed redundant NULL check