From 75722c743b14791445de6164d4e914fe79d68b4a Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 8 Sep 2023 20:33:54 -0500
Subject: [PATCH] Fix NPE

---
 src/main/java/eu/siacs/conversations/entities/Message.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 17e676c43..16c19d485 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -1088,7 +1088,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public boolean wasMergedIntoPrevious() {
         Message prev = this.prev();
-        if (getModerated() != null && prev.getModerated() != null) return true;
+        if (prev != null && getModerated() != null && prev.getModerated() != null) return true;
         return prev != null && prev.mergeable(this);
     }
 
-- 
2.45.2