Try/catch is less of a hack than duplicating upstream code imo.