diff --git a/checkin_notes b/checkin_notes
index 0a51d07725..9bfdff4d42 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9672,3 +9672,12 @@ Rom    29 Dec 2011
         
     samples/vboxwrapper/
         vboxwrapper.cpp
+
+David  30 Dec 2011
+	- client: parse APP:non_cpu_intensive correctly.
+		This got broken somehow.
+	- client: don't crash if missing RSS feed file for some reason
+
+	client/
+		client_types.cpp
+		cs_notice.cpp
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 60801eea27..d641a5be7c 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -795,6 +795,7 @@ int APP::parse(XML_PARSER& xp) {
         }
         if (xp.parse_str("name", name, sizeof(name))) continue;
         if (xp.parse_str("user_friendly_name", user_friendly_name, sizeof(user_friendly_name))) continue;
+        if (xp.parse_bool("non_cpu_intensive", non_cpu_intensive)) continue;
 #ifdef SIM
         if (xp.parse_double("latency_bound", latency_bound)) continue;
         if (xp.parse_double("fpops_est", fpops_est)) continue;
@@ -808,7 +809,6 @@ int APP::parse(XML_PARSER& xp) {
             checkpoint_period.parse(xp, "/checkpoint_period");
             continue;
         }
-        if (xp.parse_bool("non_cpu_intensive", non_cpu_intensive)) continue;
 #endif
         if (log_flags.unparsed_xml) {
             msg_printf(0, MSG_INFO,
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index f7fb6d3968..bbc4e1fcdf 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -746,6 +746,11 @@ void RSS_FEED_OP::handle_reply(int http_op_retval) {
 
     rfp->feed_file_name(filename);
     FILE* f = fopen(filename, "r");
+    if (!f) {
+        msg_printf(0, MSG_INTERNAL_ERROR,
+            "RSS feed file '%s' not found", filename
+        );
+    }
     MIOFILE fin;
     fin.init_file(f);
     XML_PARSER xp(&fin);