diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
index 7b68c7eb29..33b6facc2d 100644
--- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java
+++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
@@ -183,9 +183,10 @@ public class SmsMigrator {
       statement = ourSmsDatabase.createInsertStatement(transaction);
 
       while (cursor != null && cursor.moveToNext()) {
-        int typeColumn = cursor.getColumnIndex(SmsDatabase.TYPE);
+        int addressColumn = cursor.getColumnIndexOrThrow(SystemColumns.ADDRESS);
+        int typeColumn    = cursor.getColumnIndex(SmsDatabase.TYPE);
 
-        if (cursor.isNull(typeColumn) || isAppropriateTypeForMigration(cursor, typeColumn)) {
+        if (!cursor.isNull(addressColumn) && (cursor.isNull(typeColumn) || isAppropriateTypeForMigration(cursor, typeColumn))) {
           getContentValuesForRow(context, cursor, ourThreadId, statement);
           statement.execute();
         }