Add defensive code for resource release conflict