diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
index 86209f17df..5585698aa4 100644
--- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java
+++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
@@ -103,7 +103,9 @@ public class SmsMigrator {
       } else {
         return null;
       }
-
+    } catch (IllegalStateException iae) {
+      Log.w("SmsMigrator", iae);
+      return null;
     } finally {
       if (cursor != null)
         cursor.close();