diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 49940ee907..c2b50a0d78 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -647,7 +647,11 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
     cvb.add(DELIVERY_TIME, headers.getLongInteger(PduHeaders.DELIVERY_TIME));
     cvb.add(EXPIRY, headers.getLongInteger(PduHeaders.EXPIRY));
     cvb.add(MESSAGE_SIZE, headers.getLongInteger(PduHeaders.MESSAGE_SIZE));
-    cvb.add(ADDRESS, headers.getEncodedStringValue(PduHeaders.FROM).getTextString());
+
+    if (headers.getEncodedStringValue(PduHeaders.FROM) != null)
+      cvb.add(ADDRESS, headers.getEncodedStringValue(PduHeaders.FROM).getTextString());
+    else
+      cvb.add(ADDRESS, null);
 
     return cvb.getContentValues();
   }