Avoid null reference exception.
Merge branch 'master' of https://github.com/bodedoctor/destroy