1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index a64a373..8b58f99 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -448,7 +448,8 @@ public class CallLogBackupAgent extends BackupAgent {
             Log.e(TAG, "Subscription database is not available.");
             return false;
         }
-        if (accountComponentName.equals(TELEPHONY_PHONE_ACCOUNT_HANDLE_COMPONENT_NAME)
+        if (accountComponentName != null
+                && accountComponentName.equals(TELEPHONY_PHONE_ACCOUNT_HANDLE_COMPONENT_NAME)
                 && isPhoneAccountMigrationPending != 1) {
             return true;
         }
@@ -501,7 +502,10 @@ public class CallLogBackupAgent extends BackupAgent {
                 iccId = mSubscriptionInfoMap.get(Integer.parseInt(call.accountId));
             } catch (NullPointerException e) {
                 // Ignore, iccId will be null;
+            } catch(NumberFormatException e) {
+                // Ignore, iccId will be null;
             }
+
             if (iccId != null) {
                 Log.i(TAG, "processing PhoneAccountMigration Found Subid during Backup: "
                         + call.accountId);