diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index 3b910f7b98..64a0ec8a72 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -102,6 +102,10 @@ public class PushMediaSendJob extends PushSendJob implements InjectableType {
       throws RetryLaterException, InsecureFallbackApprovalException, UntrustedIdentityException,
              UndeliverableMessageException
   {
+    if (message.getTo() == null || message.getTo().length == 0) {
+      throw new UndeliverableMessageException("No destination address.");
+    }
+
     TextSecureMessageSender messageSender = messageSenderFactory.create();
 
     try {