1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 5700e659a..91170567d 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -546,7 +546,11 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             case android.R.id.home:
                 FragmentManager fm = getFragmentManager();
                 if (fm.getBackStackEntryCount() > 0) {
-                    fm.popBackStack();
+                    try {
+                        fm.popBackStack();
+                    } catch (IllegalArgumentException e) {
+                        Log.w(Config.LOGTAG, "Unable to pop back stack after pressing home button");
+                    }
                     return true;
                 }
                 break;