Don't call check_destroy to early
Merge pull request #863 from Metaswitch/issue862

[Reviewer Ellie] Don't call check_destroy to early