Statement unnecessarily nested within else clause
Removed unnecessary else clause and null check where variable newer be
null