Breaks API again, but only for errors (I believe... return types have become more specific, not less);