Comment 1 for bug 1161657

I am hugely in favor of cleaning this up. I also think we could do a better job of pre-emptively checking for certain things before starting any work in the manager/driver.