1 files changed, 6 insertions, 4 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index d62612c76..0645c4620 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -365,10 +365,12 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
             return -1;
         } else { // last fragment was not a list, but a feed
             long feedId = Long.parseLong(lastFragment);
-            List<Feed> feeds = navDrawerData.feeds;
-            for (int i = 0; i < feeds.size(); i++) {
-                if (feeds.get(i).getId() == feedId) {
-                    return i + navAdapter.getSubscriptionOffset();
+            if (navDrawerData != null) {
+                List<Feed> feeds = navDrawerData.feeds;
+                for (int i = 0; i < feeds.size(); i++) {
+                    if (feeds.get(i).getId() == feedId) {
+                        return i + navAdapter.getSubscriptionOffset();
+                    }
                 }
             }
             return -1;