IDE-1337 added null check