avoid ugly npe post endpoint disassociate and add additional trace to recovery
3 files changed