Handle new error cases and backfill tests