extract worker thread and change exception handling
2 files changed