* commit 'f6a30eb6f86a16d5dae1ad392c5a08292e7f446a': Tighten the checks around a detector being invalidated