diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 1a356c67..58d10815 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -59,5 +59,5 @@ public *;
 }
 
 # for bouncycastle
--keep class org.bouncycastle.jce.provider.**
+-keep class org.bouncycastle.**
 -dontwarn javax.naming.**
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index bae06e6c..904092b1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -310,9 +310,11 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
                 }
             } else {
                 String contentWarning = intent.getStringExtra("saved_toot_content_warning");
-                startingHideText = !TextUtils.isEmpty(contentWarning);
-                if (startingHideText) {
-                    startingContentWarning = contentWarning;
+                if (contentWarning != null) {
+                    startingHideText = !contentWarning.isEmpty();
+                    if (startingHideText) {
+                        startingContentWarning = contentWarning;
+                    }
                 }
             }