Indicator poll exception catch & refactoring & provider deletion
Provider removal confirmation