Bug 833783: followup, fix exception when calling destroy multiple times.
Merge pull request #781 from ochameau/destroy-followup@833783

Bug 833783: followup, fix exception when calling destroy multiple times. r=@erikvold