diff --git a/src/SIL.Machine/Scripture/ScriptureRangeParser.cs b/src/SIL.Machine/Scripture/ScriptureRangeParser.cs
index e3f78ba3..bad5211e 100644
--- a/src/SIL.Machine/Scripture/ScriptureRangeParser.cs
+++ b/src/SIL.Machine/Scripture/ScriptureRangeParser.cs
@@ -39,7 +39,7 @@ private Dictionary<string, List<int>> ParseSection(string section)
         Dictionary<string, List<int>> chaptersPerBook = new Dictionary<string, List<int>>();
 
         //*Specific chapters from one book*
-        if (char.IsDigit(section.Last()))
+        if (char.IsDigit(section.Last()) && section.Length > 3)
         {
             string bookName = section.Substring(0, 3);
             if (!_bookLengths.ContainsKey(bookName))
diff --git a/tests/SIL.Machine.Tests/Scripture/ScriptureRangeParserTests.cs b/tests/SIL.Machine.Tests/Scripture/ScriptureRangeParserTests.cs
index 4330f89e..66e57b56 100644
--- a/tests/SIL.Machine.Tests/Scripture/ScriptureRangeParserTests.cs
+++ b/tests/SIL.Machine.Tests/Scripture/ScriptureRangeParserTests.cs
@@ -27,6 +27,7 @@ public void TestParse(string rangeString, Dictionary<string, List<int>> expected
     public static IEnumerable<TestCaseData> GetCases()
     {
         yield return new TestCaseData("MAL", new Dictionary<string, List<int>> { { "MAL", new List<int>() } }, false);
+        yield return new TestCaseData("PS2", new Dictionary<string, List<int>> { { "PS2", new List<int>() } }, false);
         yield return new TestCaseData(
             "GEN,EXO",
             new Dictionary<string, List<int>> { { "GEN", new List<int>() }, { "EXO", new List<int>() } },