IDE-1833 Remove expletory check