IDE-1640 add missing null check