2 files changed, 5 insertions, 1 deletions

diff --git a/common/synchronizerstore.cpp b/common/synchronizerstore.cpp
index ca7e6d2..0d1e154 100644
--- a/common/synchronizerstore.cpp
+++ b/common/synchronizerstore.cpp
@@ -86,7 +86,10 @@ QByteArrayList SynchronizerStore::resolveLocalIds(const QByteArray &bufferType,
 {
     QByteArrayList result;
     for (const auto &l : localIds) {
-        result << resolveLocalId(bufferType, l);
+        const auto id = resolveLocalId(bufferType, l);
+        if (!id.isEmpty()) {
+            result << id;
+        }
     }
     return result;
 }
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 061fdb1..f87c5ff 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -511,6 +511,7 @@ public:
             auto localIds = resolveFilter(folderFilter);
             auto folderRemoteIds = syncStore().resolveLocalIds(ApplicationDomain::getTypeName<ApplicationDomain::Folder>(), localIds);
             for (const auto &r : folderRemoteIds) {
+                Q_ASSERT(!r.isEmpty());
                 folders << Folder{r};
             }
             return KAsync::value(folders);