Godo call. I misread this code and let my snark of try/catch blind me. Porting this change now.