Add extra guards in destroy