1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index cf49cf65e..cf078ee52 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -308,7 +308,9 @@ public class MucOptions {
 							this.error = ERROR_NO_ERROR;
 							self = user;
 							if (mNickChangingInProgress) {
-								onRenameListener.onSuccess();
+								if (onRenameListener != null) {
+									onRenameListener.onSuccess();
+								}
 								mNickChangingInProgress = false;
 							} else if (this.onJoinListener != null) {
 								this.onJoinListener.onSuccess();