diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 34a02e1b8..70d682564 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -468,7 +468,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;