2 files changed, 7 insertions, 8 deletions

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index fcd135c..3e7bd30 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -589,21 +589,19 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
     return job.then([this, operation, type, uid, oldRemoteId](const QByteArray &remoteId) {
         if (operation == Sink::Operation_Creation) {
             SinkTraceCtx(mLogCtx) << "Replayed creation with remote id: " << remoteId;
-            if (remoteId.isEmpty()) {
-                SinkWarningCtx(mLogCtx) << "Returned an empty remoteId from the creation";
-            } else {
+            if (!remoteId.isEmpty()) {
                 syncStore().recordRemoteId(type, uid, remoteId);
             }
         } else if (operation == Sink::Operation_Modification) {
             SinkTraceCtx(mLogCtx) << "Replayed modification with remote id: " << remoteId;
-            if (remoteId.isEmpty()) {
-                SinkWarningCtx(mLogCtx) << "Returned an empty remoteId from the modification";
-            } else {
+            if (!remoteId.isEmpty()) {
                syncStore().updateRemoteId(type, uid, remoteId);
             }
         } else if (operation == Sink::Operation_Removal) {
             SinkTraceCtx(mLogCtx) << "Replayed removal with remote id: " << oldRemoteId;
-            syncStore().removeRemoteId(type, uid, oldRemoteId);
+            if (!oldRemoteId.isEmpty()) {
+                syncStore().removeRemoteId(type, uid, oldRemoteId);
+            }
         } else {
             SinkErrorCtx(mLogCtx) << "Unkown operation" << operation;
         }
diff --git a/common/synchronizerstore.cpp b/common/synchronizerstore.cpp
index dea4821..5364094 100644
--- a/common/synchronizerstore.cpp
+++ b/common/synchronizerstore.cpp
@@ -73,7 +73,8 @@ QByteArray SynchronizerStore::resolveLocalId(const QByteArray &bufferType, const
 {
     QByteArray remoteId = Index("localid.mapping." + bufferType, mTransaction).lookup(localId);
     if (remoteId.isEmpty()) {
-        SinkWarning() << "Couldn't find the remote id for " << bufferType << localId;
+        //This can happen if we didn't store the remote id in the first place
+        SinkTrace() << "Couldn't find the remote id for " << bufferType << localId;
         return QByteArray();
     }
     return remoteId;