This could force a crash as it was being deleted twice.
Merge branch 'testing' of https://github.com/jappeace/hw-isgp-kbs into testing