diff --git a/src/org/thoughtcrime/securesms/service/SmsSender.java b/src/org/thoughtcrime/securesms/service/SmsSender.java
index 750497ee71..c2e3071ca7 100644
--- a/src/org/thoughtcrime/securesms/service/SmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/SmsSender.java
@@ -262,6 +262,9 @@ public class SmsSender {
       } catch (NullPointerException npe) {
         Log.w("SmsSender", npe);
         DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
+      } catch (IllegalArgumentException iae) {
+        Log.w("SmsSender", iae);
+        DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
       }
     }
   }