diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
index c67cc6c5e..a91b2b66a 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@@ -81,7 +81,8 @@ public class GtasksInvoker {
   private void checkToken() {
     if (Strings.isNullOrEmpty(credential.getAccessToken())) {
       Bundle bundle = googleAccountManager.getAccessToken(account, TasksScopes.TASKS);
-      credential.setAccessToken(bundle.getString(AccountManager.KEY_AUTHTOKEN));
+      credential.setAccessToken(
+          bundle != null ? bundle.getString(AccountManager.KEY_AUTHTOKEN) : null);
     }
   }
 
diff --git a/app/src/main/java/org/tasks/drive/DriveInvoker.java b/app/src/main/java/org/tasks/drive/DriveInvoker.java
index ded53f0e1..965de5322 100644
--- a/app/src/main/java/org/tasks/drive/DriveInvoker.java
+++ b/app/src/main/java/org/tasks/drive/DriveInvoker.java
@@ -62,7 +62,8 @@ public class DriveInvoker {
     if (Strings.isNullOrEmpty(credential.getAccessToken())) {
       String account = preferences.getStringValue(R.string.p_google_drive_backup_account);
       Bundle bundle = googleAccountManager.getAccessToken(account, DriveScopes.DRIVE_FILE);
-      credential.setAccessToken(bundle.getString(AccountManager.KEY_AUTHTOKEN));
+      credential.setAccessToken(
+          bundle != null ? bundle.getString(AccountManager.KEY_AUTHTOKEN) : null);
     }
   }