diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 24ef9a6f7..91e1c81f9 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -605,8 +605,11 @@ public class ConversationActivity extends XmppActivity implements
 					.beginTransaction();
 			transaction.replace(R.id.selected_conversation, selectedFragment,
 					"conversation");
-
-			transaction.commitAllowingStateLoss();
+			try {
+				transaction.commitAllowingStateLoss();
+			} catch (IllegalStateException e) {
+				return selectedFragment;
+			}
 		}
 		return selectedFragment;
 	}
@@ -786,6 +789,10 @@ public class ConversationActivity extends XmppActivity implements
 				attachAudioToConversation(getSelectedConversation(),
 						data.getData());
 			}
+		} else {
+			if (requestCode == REQUEST_IMAGE_CAPTURE) {
+				pendingImageUri = null;
+			}
 		}
 	}