Protect restart to avoid multiple threads from stepping on each other
Merge pull request #543 from Juniper/discofixs

Protect restart to avoid multiple threads from stepping on each other