VE-742 Revert unnecessary isset() checks