1 files changed, 6 insertions, 1 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/text/Text.java b/vespajlib/src/main/java/com/yahoo/text/Text.java
index 2f0051d4795..a2e7a696857 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Text.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Text.java
@@ -186,7 +186,12 @@ public final class Text {
         int len = s.length();
         if ((fromCP >= len) || (fromCP >= toCP)) return "";
 
-        int from = s.offsetByCodePoints(0, fromCP);
+        int from;
+        try {
+            from = s.offsetByCodePoints(0, fromCP);
+        } catch (IndexOutOfBoundsException e) {
+            return "";
+        }
         if (from >= len) return "";
         int lenCP = toCP - fromCP;
         if (from + lenCP >= len) return s.substring(from);