diff --git a/MultiversalDiplomacyTests/ScriptTests.cs b/MultiversalDiplomacyTests/ScriptTests.cs
index e173a4a..30a1b26 100644
--- a/MultiversalDiplomacyTests/ScriptTests.cs
+++ b/MultiversalDiplomacyTests/ScriptTests.cs
@@ -19,10 +19,13 @@ public class ScriptTests
     [TestCaseSource(nameof(DatcTestCases))]
     public void Test_DATC(string testScriptPath)
     {
+        string filename = Path.GetFileName(testScriptPath);
+        int line = 0;
         IScriptHandler? handler = new SetupScriptHandler(World.WithStandardMap(), strict: true);
         foreach (string input in File.ReadAllLines(testScriptPath)) {
+            line++;
             handler = handler?.HandleInput(input);
-            Assert.That(handler, Is.Not.Null, $"Script quit unexpectedly at \"{input}\"");
+            if (handler is null) Assert.Fail($"Script {filename} quit unexpectedly at line {line}: \"{input}\"");
         }
     }
 }