From 24f54cec25221aa727a3ec8866ca25dc73c1fbda Mon Sep 17 00:00:00 2001
From: ojiikun <ojiikun@gmail.com>
Date: Sat, 6 Apr 2013 20:09:14 +0000
Subject: [PATCH] Fix NPE crash when adding new feed.

---
 .../src/com/newsblur/fragment/AddSitesListFragment.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/media/android/NewsBlur/src/com/newsblur/fragment/AddSitesListFragment.java b/media/android/NewsBlur/src/com/newsblur/fragment/AddSitesListFragment.java
index e3dda7fc8..1784780d7 100644
--- a/media/android/NewsBlur/src/com/newsblur/fragment/AddSitesListFragment.java
+++ b/media/android/NewsBlur/src/com/newsblur/fragment/AddSitesListFragment.java
@@ -14,6 +14,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.Base64;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -129,6 +130,12 @@ public class AddSitesListFragment extends Fragment {
 
 			for (String feedId : category.feedIds) {
 				Feed feed = response.feeds.get(feedId);
+
+                if (null == feed) {
+                    Log.w(this.getClass().getName(), "Skipping feed ID with no corresponding feed: " + feedId);
+                    continue;
+                }
+
 				View feedView = inflater.inflate(R.layout.merge_category_feed, null);
 				TextView feedTitle = (TextView) feedView.findViewById(R.id.login_category_feed_title);
 				feedTitle.setText(feed.title);