Don't crash on nil discoverer (fixes #917)