TIMOB-12134-formatted the code as per the standard, removed the additional null check