diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 57d433ca6872b78c1297a4173a58f3d43f981139..068fafb4cb029054ba1ec25387cfd2ee80155974 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2439,7 +2439,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                             String fillableFieldType = null;
                             String fillableFieldValue = null;
                             for (eu.siacs.conversations.xmpp.forms.Field field : form.getFields()) {
-                                if ((field.getType() == null || (!field.getType().equals("hidden") && !field.getType().equals("fixed"))) && !field.getFieldName().equals("http://jabber.org/protocol/commands#actions")) {
+                                if ((field.getType() == null || (!field.getType().equals("hidden") && !field.getType().equals("fixed"))) && field.getFieldName() != null && !field.getFieldName().equals("http://jabber.org/protocol/commands#actions")) {
                                     fillableFieldType = field.getType();
                                     fillableFieldValue = field.getValue();
                                     fillableFieldCount++;