Merge "Add destroyed check"