diff --git a/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
index 020da3e9a..8adcd2deb 100644
--- a/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -161,6 +161,9 @@ public class AndroidUtilities {
      */
     @SuppressWarnings("nls")
     public static ContentValues contentValuesFromString(String string) {
+        if(string == null)
+            return null;
+
         String[] pairs = string.split(",");
         ContentValues result = new ContentValues();
         for(String item : pairs) {
diff --git a/astrid/default.properties b/astrid/default.properties
index 08ad68f11..a72fa071c 100644
--- a/astrid/default.properties
+++ b/astrid/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-4
+target=Google Inc.:Google APIs:8
 apk-configurations=
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 1920db849..7290a3ac8 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -287,7 +287,10 @@ public class FilterListActivity extends ExpandableListActivity {
             shortcutIntent.setAction(Intent.ACTION_VIEW);
             shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_TITLE, filter.title);
             shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_SQL, filter.sqlQuery);
-            shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_VALUES, filter.valuesForNewTasks.toString());
+            if(filter.valuesForNewTasks != null) {
+                shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_VALUES,
+                        filter.valuesForNewTasks.toString());
+            }
 
             menuItem.setIntent(shortcutIntent);
         }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index b19dc9dc7..93e73410f 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -171,7 +171,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
             // launched from desktop shortcut, must create a fake filter
             String title = extras.getString(TOKEN_FILTER_TITLE);
             String sql = extras.getString(TOKEN_FILTER_SQL);
-            ContentValues values = AndroidUtilities.contentValuesFromString(extras.getString(TOKEN_FILTER_VALUES));
+            ContentValues values = null;
+            if(extras.containsKey(TOKEN_FILTER_VALUES))
+                values = AndroidUtilities.contentValuesFromString(extras.getString(TOKEN_FILTER_VALUES));
 
             filter = new Filter("", "", title, new QueryTemplate(), values); //$NON-NLS-1$ //$NON-NLS-2$
             filter.sqlQuery = sql;