Worker thread now waits for completion before returning from stop() to
avoid crash bug