Should this be moved before the ThrottlingErrorChecker?