diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 16ca11e5f7..d3299d8918 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1432,7 +1432,7 @@ public class FragmentIdentity extends FragmentBase {
                         onDelete();
                     break;
                 case REQUEST_SIGNATURE:
-                    if (resultCode == RESULT_OK)
+                    if (resultCode == RESULT_OK && data != null)
                         onHtml(data.getExtras());
                     break;
             }