Further performance improvements
Fixing error when cancelling detection (returning None only twice!)