Fix bug where failed ATS service registration would leave around stale handles