Removed superfluous null check