Added double-locked checking and checks for ToxService running