1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
index db2bf1242..d30c68a97 100644
--- a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
+++ b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
@@ -33,10 +33,13 @@ import android.support.text.emoji.EmojiCompat;
 public class EmojiWrapper {
 
     public static CharSequence transform(CharSequence input) {
-        final CharSequence charSequence;
-        if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
-            return EmojiCompat.get().process(input);
-        } else {
+        try {
+            if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
+                return EmojiCompat.get().process(input);
+            } else {
+                return input;
+            }
+        } catch (IllegalStateException e) {
             return input;
         }
     }