1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java
index ddc05981..dcc44979 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java
@@ -166,6 +166,10 @@ abstract class NotesServerSyncTask extends Thread {
 
             // FIXME re-reading the localAccount is only a workaround for a not-up-to-date eTag in localAccount.
             final Account accountFromDatabase = db.getAccountDao().getAccountById(localAccount.getId());
+            if (accountFromDatabase == null) {
+                callbacks.remove(localAccount.getId());
+                return true;
+            }
             localAccount.setModified(accountFromDatabase.getModified());
             localAccount.setETag(accountFromDatabase.getETag());