reorganise a bit the code so that resources that we cleanup in finally:
happens just before the try:

Also, remove the handler in finally case, partitions that where failing
again and again apparently added handler again and again.