diff --git a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java b/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
index 30e6ba62..b9bd0f95 100644
--- a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
+++ b/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
@@ -281,7 +281,9 @@ public abstract class FindAllQuery<T extends PersistentRecord>
                 got.add(key);
                 cnt++;
             }
-            if (cnt != keys.size()) {
+            // if we get more results than we planned, or if we're doing a two-phase query and got
+            // fewer, then complain
+            if (cnt > keys.size() || (origStmt != null && cnt < keys.size())) {
                 log.warning("Row count mismatch in second pass", "origQuery", origStmt,
                             "wanted", keys, "got", got, "dups", dups, new Exception());
             }