diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index 93f8a052a..2cec94da1 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -212,9 +212,9 @@ public class UpdateMessageService {
     private ClickableSpan getClickableSpanForUpdate(JSONObject update, String type) {
         if ("pref".equals(type)) {
             try {
-                if (!update.has("prefs"))
+                if (!update.has("action_list"))
                     return null;
-                JSONArray prefSpec = update.getJSONArray("prefs");
+                JSONArray prefSpec = update.getJSONArray("action_list");
                 if (prefSpec.length() == 0)
                     return null;
                 final String prefArray = prefSpec.toString();
@@ -231,9 +231,9 @@ public class UpdateMessageService {
             }
         } else if ("screen".equals(type)) {
             try {
-                if (!update.has("screens"))
+                if (!update.has("action_list"))
                     return null;
-                JSONArray screens = update.getJSONArray("screens");
+                JSONArray screens = update.getJSONArray("action_list");
                 if (screens.length() == 0)
                     return null;
                 final ArrayList<String> screenList = new ArrayList<String>();
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java b/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
index 289e3f9da..2bb3eb8cf 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
@@ -3,6 +3,7 @@ package com.todoroo.astrid.service;
 import java.util.ArrayList;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -49,6 +50,9 @@ public class UpdateScreenFlow extends Activity {
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
             finish();
+        } catch (ActivityNotFoundException e) {
+            e.printStackTrace();
+            finish();
         }
     }