diff --git a/src/org/thoughtcrime/securesms/mms/PartParser.java b/src/org/thoughtcrime/securesms/mms/PartParser.java
index 8d3fbc4f1f..d43c0ed4c7 100644
--- a/src/org/thoughtcrime/securesms/mms/PartParser.java
+++ b/src/org/thoughtcrime/securesms/mms/PartParser.java
@@ -24,7 +24,11 @@ public class PartParser {
           if (characterSet.equals(CharacterSets.MIMENAME_ANY_CHARSET))
             characterSet = CharacterSets.MIMENAME_ISO_8859_1;
 
-          partText = new String(body.getPart(i).getData(), characterSet);
+          if (body.getPart(i).getData() != null) {
+            partText = new String(body.getPart(i).getData(), characterSet);
+          } else {
+            partText = "";
+          }
         } catch (UnsupportedEncodingException e) {
           Log.w("PartParser", e);
           partText = "Unsupported Encoding!";