Removed unneeded null check