diff --git a/jOOQ/src/main/java/org/jooq/impl/Convert.java b/jOOQ/src/main/java/org/jooq/impl/Convert.java
index 9b69b75276..98e0a7d233 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Convert.java
@@ -1207,12 +1207,13 @@ final class Convert {
         }
 
         private static final String patchIso8601(String string, boolean t) {
-            if (t && string.charAt(10) == ' ')
-                return string.substring(0, 10) + "T" + string.substring(11);
-            else if (!t && string.charAt(10) == 'T')
-                return string.substring(0, 10) + " " + string.substring(11);
-            else
-                return string;
+            if (string.length() > 11)
+                if (t && string.charAt(10) == ' ')
+                    return string.substring(0, 10) + "T" + string.substring(11);
+                else if (!t && string.charAt(10) == 'T')
+                    return string.substring(0, 10) + " " + string.substring(11);
+
+            return string;
         }
 
         @Override
diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java
index fc45c85d4b..e6412f9782 100644
--- a/jOOQ/src/main/java/org/jooq/tools/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java
@@ -1199,12 +1199,13 @@ public final class Convert {
         }
 
         private static final String patchIso8601(String string, boolean t) {
-            if (t && string.charAt(10) == ' ')
-                return string.substring(0, 10) + "T" + string.substring(11);
-            else if (!t && string.charAt(10) == 'T')
-                return string.substring(0, 10) + " " + string.substring(11);
-            else
-                return string;
+            if (string.length() > 11)
+                if (t && string.charAt(10) == ' ')
+                    return string.substring(0, 10) + "T" + string.substring(11);
+                else if (!t && string.charAt(10) == 'T')
+                    return string.substring(0, 10) + " " + string.substring(11);
+
+            return string;
         }
 
         @Override