Safer destroy handling