Check if global discovery was actually started before trying to stop it (fixes #653)
Merge pull request #654 from AudriusButkevicius/disco

Check if global discovery was actually started before trying to stop it (fixes #653)