Added error catch on destroy