diff --git a/Hijack_PersonalityTableBuild.s b/Hijack_PersonalityTableBuild.s
index 7c26669..5bf3548 100644
--- a/Hijack_PersonalityTableBuild.s
+++ b/Hijack_PersonalityTableBuild.s
@@ -23,6 +23,11 @@ Hijack_PersonalityTableBuild: @ hook at overlay 12, 0x39F4 (0x02223614)
   @ get pokemon-in-party index from active party member table
   ldrb r2, [r1, r4]
 
+  @ skip if invalid/blank ID
+  @ may not need this? not sure, but copying this from Hijack_PersonalityTableBuild2 just in case
+  cmp r2, #6
+  beq .end
+
   @ load loop variable as party index
   @ note about the party index:
   @ 0 and 2 are either the player or partner pokemon, and 1 and 3 are enemy trainer(s).
diff --git a/Hijack_PersonalityTableBuild2.s b/Hijack_PersonalityTableBuild2.s
index a373e08..6dfe073 100644
--- a/Hijack_PersonalityTableBuild2.s
+++ b/Hijack_PersonalityTableBuild2.s
@@ -27,6 +27,10 @@ Hijack_PersonalityTableBuild2: @ hook at overlay 16, 0x26E8 (0x0223D828)
   @ get pokemon-in-party index from active party member table
   ldrb r2, [r6, r5]
 
+  @ skip if invalid/blank ID
+  cmp r2, #6
+  beq .loop_check
+
   @ load loop variable as party index
   @ note about the party index:
   @ 0 and 2 are either the player or partner pokemon, and 1 and 3 are enemy trainer(s).
@@ -46,6 +50,8 @@ Hijack_PersonalityTableBuild2: @ hook at overlay 16, 0x26E8 (0x0223D828)
   lsl r1, r5, #2
   str r0, [r3, r1]
 
+  .loop_check:
+
   add r5, r5, #1
   cmp r5, #4
   bls .loop