fix: Make sure cross context cleanup doesn't raise an error (#58)

fix: Make sure cross context cleanup doesn't raise an error (#58) #123