diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 15d157f2f..79cdbb074 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -54,6 +54,7 @@ public class GtasksPreferences extends SyncProviderPreferences {
     @Override
     public void startSync() {
         new GtasksSyncProvider().synchronize(this);
+        finish();
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index fda01d507..6d9524dc1 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -208,7 +208,8 @@ public class FilterListActivity extends ExpandableListActivity {
             if(filter instanceof FilterWithCustomIntent) {
                 FilterWithCustomIntent customFilter = ((FilterWithCustomIntent)filter);
                 intent.setComponent(customFilter.customTaskList);
-                intent.getExtras().putAll(customFilter.customExtras);
+                if(customFilter.customExtras != null)
+                    intent.getExtras().putAll(customFilter.customExtras);
             }
             startActivity(intent);
             AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$
diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
index f7c896fb2..b8c068809 100644
--- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
@@ -144,8 +144,10 @@ public class ShortcutActivity extends Activity {
         if(filter instanceof FilterWithCustomIntent) {
             FilterWithCustomIntent customFilter = ((FilterWithCustomIntent)filter);
             shortcutIntent.putExtra(TOKEN_CUSTOM_CLASS, customFilter.customTaskList.flattenToString());
-            for(String key : customFilter.customExtras.keySet())
-                putExtra(shortcutIntent, key, customFilter.customExtras.get(key));
+            if(customFilter.customExtras != null) {
+                for(String key : customFilter.customExtras.keySet())
+                    putExtra(shortcutIntent, key, customFilter.customExtras.get(key));
+            }
         }
 
         shortcutIntent.setAction(Intent.ACTION_VIEW);