diff --git a/test/test_runner.c b/test/test_runner.c
index f279835c4b..8ca5b488e3 100644
--- a/test/test_runner.c
+++ b/test/test_runner.c
@@ -684,12 +684,22 @@ static s32 MgbaVPrintf_(const char *fmt, va_list va)
                 break;
             case 'S':
                 pokeS = va_arg(va, const u8 *);
-                while ((c = *pokeS++) != EOS)
+                if (pokeS == NULL)
                 {
-                    if ((c = gWireless_RSEtoASCIITable[c]) != '\0')
-                        i = MgbaPutchar_(i, c);
-                    else
-                        i = MgbaPutchar_(i, '?');
+                    i = MgbaPutchar_(i, 'N');
+                    i = MgbaPutchar_(i, 'U');
+                    i = MgbaPutchar_(i, 'L');
+                    i = MgbaPutchar_(i, 'L');
+                }
+                else
+                {
+                    while ((c = *pokeS++) != EOS)
+                    {
+                        if ((c = gWireless_RSEtoASCIITable[c]) != '\0')
+                            i = MgbaPutchar_(i, c);
+                        else
+                            i = MgbaPutchar_(i, '?');
+                    }
                 }
                 break;
             }
diff --git a/test/text.c b/test/text.c
index 8e9a205196..981d03fdc0 100644
--- a/test/text.c
+++ b/test/text.c
@@ -811,6 +811,7 @@ TEST("Battle strings fit on the battle message window")
     default:
         break;
     }
+    EXPECT(gBattleStringsTable[battleStringId] != NULL);
     BattleStringExpandPlaceholders(gBattleStringsTable[battleStringId], battleString, BATTLE_STRING_BUFFER_SIZE);
     DebugPrintf("Battle String ID %d: %S", battleStringId, battleString);
     for (j = 1;; j++)