Fixed logic in tear down to properly attempt aggressive shutdown