Safer distructor - some checks added.

No match.