Extra check on destroy