diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20c4d4d0b5..804b63e844 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,6 +81,7 @@
Group Conversation
%d recipients in group
Saving draft...
+ Invalid recipient!
Message details
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 01b5a5987a..664617bd63 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -300,6 +300,12 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
}
private void handleStartSecureSession() {
+ if (getRecipients() == null) {
+ Toast.makeText(this, getString(R.string.ConversationActivity_invalid_recipient),
+ Toast.LENGTH_LONG).show();
+ return;
+ }
+
final Recipient recipient = getRecipients().getPrimaryRecipient();
String recipientName = (recipient.getName() == null ? recipient.getNumber() : recipient.getName());
AlertDialog.Builder builder = new AlertDialog.Builder(this);