diff --git a/gts/pokemondpds.ashx.cs b/gts/pokemondpds.ashx.cs
index 31e128bc..b1ff780e 100644
--- a/gts/pokemondpds.ashx.cs
+++ b/gts/pokemondpds.ashx.cs
@@ -491,7 +491,7 @@ namespace PkmnFoundations.GTS
 
                     BattleTowerRecord4[] opponents = DataAbstract.Instance.BattleTowerGetOpponents4(pid, rank, roomNum);
                     BattleTowerProfile4[] leaders = DataAbstract.Instance.BattleTowerGetLeaders4(rank, roomNum);
-                    BattleTowerRecord4[] fakeOpponents = FakeOpponentGenerator4.GenerateFakeOpponents(7);
+                    BattleTowerRecord4[] fakeOpponents = FakeOpponentGenerator4.GenerateFakeOpponents(7 - opponents.Length);
 
                     foreach (BattleTowerRecord4 record in fakeOpponents)
                     {
diff --git a/gts/syachi2ds.ashx.cs b/gts/syachi2ds.ashx.cs
index c136fe49..756c323f 100644
--- a/gts/syachi2ds.ashx.cs
+++ b/gts/syachi2ds.ashx.cs
@@ -490,7 +490,7 @@ namespace PkmnFoundations.GTS
                     if (opponents.Length != 7)
                     {
                         // todo: Implement fake trainers on Gen5 too.
-                        ShowError(context, 400);
+                        ShowError(context, 500);
                         return;
                     }