- added null check