Revert "Update before adding threadpools"

This reverts commit 3b7d3821250c37dcb9c7b1e6f64c727022f5c952.
Error handling