For whatever reason, make sure we always have a live thread able to serve requests
Final fix for #523