diff --git a/jOOQ-test/src/test/java/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/test/java/org/jooq/test/_/testcases/FetchTests.java
index 856d927d38..92ad51f208 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/_/testcases/FetchTests.java
@@ -74,6 +74,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.NoSuchElementException;
 import java.util.Queue;
 
 import org.jooq.AttachableInternal;
@@ -1726,8 +1727,18 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             assertFalse(cursor.hasNext());
             assertTrue(cursor.isClosed());
 
-            assertEquals(null, it.next());
-            assertEquals(null, it.next());
+            try {
+                it.next();
+                fail();
+            }
+            catch (NoSuchElementException expected) {}
+
+            try {
+                it.next();
+                fail();
+            }
+            catch (NoSuchElementException expected) {}
+
             assertEquals(null, cursor.fetchOne());
             assertEquals(null, cursor.fetchOne());
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
index c4c5b0a170..de0e034659 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
@@ -66,6 +66,7 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 import org.jooq.Cursor;
 import org.jooq.ExecuteContext;
@@ -194,13 +195,12 @@ class CursorImpl<R extends Record> implements Cursor<R> {
         iterator();
 
         ResultImpl<R> result = new ResultImpl<R>(ctx.configuration(), fields);
-        R record = null;
 
         ctx.result(result);
         listener.resultStart(ctx);
 
-        for (int i = 0; i < number && ((record = iterator().next()) != null); i++) {
-            result.addRecord(record);
+        for (int i = 0; i < number && iterator().hasNext(); i++) {
+            result.addRecord(iterator().next());
         }
 
         ctx.result(result);
@@ -1385,9 +1385,8 @@ class CursorImpl<R extends Record> implements Cursor<R> {
 
         @Override
         public final R next() {
-            if (hasNext == null) {
-                return fetchOne();
-            }
+            if (!hasNext())
+                throw new NoSuchElementException("There are no more records to fetch from this Cursor");
 
             R result = next;
             hasNext = null;