diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index bc721066c..504ef04ca 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -625,8 +625,8 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
         if (resultCode == RESULT_CANCELED)
             return;
 
-        if (requestCode == REQUEST_CODE_GOOGLE_ACCOUNTS) {
-            String accounts[] = data.getExtras().getStringArray(
+        if (requestCode == REQUEST_CODE_GOOGLE_ACCOUNTS && data != null && credentialsListener != null) {
+            String accounts[] = data.getStringArrayExtra(
                     GoogleLoginServiceConstants.ACCOUNTS_KEY);
             credentialsListener.getCredentials(accounts);
         } else if (requestCode == LoginButton.REQUEST_CODE_FACEBOOK) {