Locator: join thread when terminating

Fix #236