2 files changed, 3 insertions, 1 deletions

diff --git a/common/entitystorage.cpp b/common/entitystorage.cpp
index 33b65d6..b77b481 100644
--- a/common/entitystorage.cpp
+++ b/common/entitystorage.cpp
@@ -148,7 +148,6 @@ ResultSet EntityStorageBase::getResultSet(const Akonadi2::Query &query, Akonadi2
                 return key;
             }
             //We're done
-            //FIXME make sure result set understands that this means we're done
             return QByteArray();
         });
     }
diff --git a/common/resultset.h b/common/resultset.h
index a888177..746b94b 100644
--- a/common/resultset.h
+++ b/common/resultset.h
@@ -70,6 +70,9 @@ class ResultSet {
                 }
                 return mIt != mResultSet.constEnd();
             }
+            if (!mCurrentValue.isNull()) {
+                return true;
+            }
             return false;
         }