From a4f79def3d4f49f26783c99b0df4396cc3d682a0 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 29 May 2024 19:57:51 -0500
Subject: [PATCH] Fix NPE

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

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 780ee0cc4356e2426616e96b045773d97f4b0dcb..55a9cadf5a8c09b1eb3b1cd4ac61afcd719e74bd 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -951,7 +951,7 @@ public class MucOptions {
 
         public boolean setAvatar(Avatar avatar) {
             if (occupantId != null) {
-                options.getConversation().setAttribute("occupantAvatar/" + occupantId, getContact() == null ? avatar.sha1sum : null);
+                options.getConversation().setAttribute("occupantAvatar/" + occupantId, getContact() == null && avatar != null ? avatar.sha1sum : null);
             }
             if (this.avatar != null && this.avatar.equals(avatar)) {
                 return false;