diff --git a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
index 57a0e90b95..740657dcf7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
@@ -51,6 +51,7 @@ import static org.jooq.Comparator.NOT_IN;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
index 279b17c594..1088696799 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
@@ -64,9 +64,8 @@ final class UDTFieldImpl<R extends UDTRecord<R>, T> extends AbstractField<T> imp
         this.udt = udt;
 
         // [#1199] The public API of UDT returns immutable field lists
-        if (udt instanceof UDTImpl) {
+        if (udt instanceof UDTImpl)
             ((UDTImpl<?>) udt).fields0().add(this);
-        }
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java
index 760c573992..5cd08d7055 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java
@@ -37,6 +37,8 @@
  */
 package org.jooq.tools.jdbc;
 
+import static org.jooq.SQLDialect.DEFAULT;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.Reader;
@@ -67,8 +69,11 @@ import java.util.Map;
 import org.jooq.Converter;
 import org.jooq.Converters;
 import org.jooq.Field;
+import org.jooq.Record;
 import org.jooq.Result;
+import org.jooq.impl.DSL;
 import org.jooq.tools.Convert;
+import org.jooq.tools.StringUtils;
 
 /**
  * A mock result set.
@@ -1244,6 +1249,22 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali
 
     @Override
     public String toString() {
-        return result == null ? "null" : result.toString();
+        if (result == null)
+            return "null";
+        else if (result.size() == 0 || index == 0 || index > size())
+            return result.toString();
+
+        String prefix = "row " + index + " -> ";
+        String prefixEmpty = StringUtils.leftPad("", prefix.length());
+
+        Result<Record> r = DSL.using(DEFAULT).newResult(result.fields());
+        r.addAll(result.subList(Math.max(0, index - 3), Math.min(result.size(), index + 2)));
+
+        StringBuilder sb = new StringBuilder();
+        String[] split = r.toString().split("\n");
+        for (int i = 0; i < split.length; i++)
+            sb.append(i - 2 == Math.min(3, index) ? prefix : prefixEmpty).append(split[i]).append('\n');
+
+        return sb.toString();
     }
 }