#443 added checks in destroy, and implematation fixes