Fix more of the try logic