Proactively handle capapbility query errors, instrument
Fix detect_strategy doco
Ensure detect_strategy returns the strategy class
s/if/whether/