=== modified file 'src/com/goldencode/p2j/persist/AdaptiveQuery.java'
--- old/src/com/goldencode/p2j/persist/AdaptiveQuery.java	2025-05-12 13:34:01 +0000
+++ new/src/com/goldencode/p2j/persist/AdaptiveQuery.java	2025-05-20 16:04:26 +0000
@@ -1303,7 +1303,14 @@
                      throw e;
                   }
                   
-                  cursor.addResultFirst(getCurrentIds());
+                  if (available)
+                  {
+                     cursor.addResultFirst(getCurrentIds());
+                  }
+                  else
+                  {
+                     cursor.addResultFirst(null);
+                  }
                }
             }
             else
@@ -1325,7 +1332,14 @@
                   }
                }
                
-               cursor.addResultFirst(getCurrentIds());
+               if (available)
+               {
+                  cursor.addResultFirst(getCurrentIds());
+               }
+               else
+               {
+                  cursor.addResultFirst(null);
+               }
             }
          }
          else
@@ -1340,7 +1354,14 @@
                throw e;
             }
          
-            cursor.addResultFirst(getCurrentIds());
+            if (available)
+            {
+               cursor.addResultFirst(getCurrentIds());
+            }
+            else
+            {
+               cursor.addResultFirst(null);
+            }
          }
          
          
@@ -1439,7 +1460,14 @@
             throw e;
          }
          
-         cursor.addResultLast(getCurrentIds());
+         if (avail)
+         {
+            cursor.addResultLast(getCurrentIds());
+         }
+         else
+         {
+            cursor.addResultLast(null);
+         }
          
          return avail;
       }