Remove unnecessary null check

Issue: SPR-12378
Merge pull request #677 from ksseo0701/SPR-12378

* SPR-12378:
  Remove unnecessary null check