diff --git a/src/org/thoughtcrime/securesms/database/ApnDatabase.java b/src/org/thoughtcrime/securesms/database/ApnDatabase.java
index d388b477e7..c839be415a 100644
--- a/src/org/thoughtcrime/securesms/database/ApnDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ApnDatabase.java
@@ -95,7 +95,10 @@ public class ApnDatabase {
                                                                              final String apn)
   {
 
-    if (mccmnc == null) throw new InvalidParameterException("mccmnc must not be null");
+    if (mccmnc == null) {
+      Log.w(TAG, "mccmnc was null, returning null");
+      return null;
+    }
 
     Cursor cursor = null;