1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
index b40452f1a..50519a2a7 100644
--- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
@@ -597,8 +597,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             cursor.moveToLast();
             do {
                 Message message = Message.fromCursor(cursor);
-                message.setConversation(conversation);
-                list.add(message);
+                if (message != null) {
+                    message.setConversation(conversation);
+                    list.add(message);
+                }
             } while (cursor.moveToPrevious());
         }
         cursor.close();