Refactor closing of persistent devices upon failure.