Removed redundand null checks