This patch consolidates quite of bit of code in the control thread to
place all the cleanup/error handling into one place.